am 7908a68e: (-s ours) Reconcile with jb-release - do not merge

* commit '7908a68e7041459c383513a67fbda8da1bba3177':
This commit is contained in:
The Android Open Source Project 2012-09-06 08:31:24 -07:00 committed by Android Git Automerger
commit 83e3842f4e

Diff content is not available