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

Change-Id: I145f70e1468eb53bf0ab955ff096ea795797bd3b
This commit is contained in:
The Android Open Source Project 2012-10-31 09:17:25 -07:00
commit 9b41ac7ba5

Diff Content Not Available