Reconcile with jb-release - do not merge

Change-Id: Ie539da33a9901ca28759cf85c566bdf201191319
This commit is contained in:
The Android Open Source Project 2012-08-06 13:49:54 -07:00
commit 1210541bfd

Diff Content Not Available