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

Change-Id: Iddfb8f231599cb4d38212670febe9048cc97b572
This commit is contained in:
The Android Open Source Project 2012-10-10 09:45:05 -07:00
commit af528e0d33

Diff Content Not Available