am 8bb46bec: am a4a9820f: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '8bb46bec8b798c9fb3ac5e906ec8c3b1fbccc853':
This commit is contained in:
The Android Open Source Project
2012-08-16 19:01:47 -07:00
committed by Android Git Automerger

Diff Content Not Available