Reconcile with jb-mr1-release - do not merge

Change-Id: Iceb2911409f7fd9d4179c536ed05b758d91eb94a
This commit is contained in:
The Android Open Source Project committed 2012-10-02 09:19:52 -07:00
commit a376f22c70

Diff Content Not Available