Reconcile with jb-mr1-release - do not merge

Change-Id: Iae77154c6944fa7a6bde1087a6823ef4fcae009c
This commit is contained in:
The Android Open Source Project 2012-09-24 10:13:44 -07:00
commit 16a3b838f2

Diff content is not available