am e2106796: Reconcile with jb-release

* commit 'e2106796e91d618f7c77d338302ab4e87c20e132':
main
The Android Open Source Project 2012-06-19 07:20:46 -07:00 committed by Android Git Automerger
commit b0d61cb951

Diff Content Not Available