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

Change-Id: Ic82b52d2ef117f9c7820c88a8e44b81b25766f80
This commit is contained in:
The Android Open Source Project 2012-10-12 07:31:16 -07:00
commit 580904ea01

Diff content is not available