Reconcile with jb-mr1-release - do not merge

Change-Id: Ia7aa78867ab0f737f847d34983cc41e58d5617cc
main
The Android Open Source Project 2012-09-07 15:04:02 -07:00
commit 3992de13e2

Diff Content Not Available