am b6b9f0a6: Reconcile with jb-release

* commit 'b6b9f0a6b1e7a4b1a55674bb75ea81af121b4279':
main
The Android Open Source Project 2012-06-29 08:19:41 -07:00 committed by Android Git Automerger
commit 5514d11cfc

Diff Content Not Available