Reconcile with jb-mr1-release - do not merge

Change-Id: Ida7b9f23f8deb451a9e6e9f2714d7a677fb6ca1c
This commit is contained in:
The Android Open Source Project 2012-08-22 15:35:30 -07:00
commit 0ff05c75d7

Diff Content Not Available