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

Change-Id: Ifb0a30557854004e5a4c90944908a91d70ceb8c6
This commit is contained in:
The Android Open Source Project 2012-11-27 07:33:48 -08:00
commit c5a129e117

Diff content is not available