Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I50d7a0cbc6632c78a725810d960e049c310b3597
This commit is contained in:
The Android Open Source Project 2012-10-15 07:38:56 -07:00
commit 935ba80962

Diff Content Not Available