am e35ae86e: Reconcile with jb-release
* commit 'e35ae86e70b1e728c220867d5a2aa66955c87c34':
This commit is contained in:
committed by
Android Git Automerger
commit
22bd479e2e