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

Change-Id: Ie4f29093944bea7faa6eb3b3afaf098336c761ba
This commit is contained in:
The Android Open Source Project 2012-11-06 08:49:43 -08:00
commit 25e3f42871

Diff content is not available