am ea88e2ff: (-s ours) am 150da225: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'ea88e2ffe86cad12387c8ab741c38de6e6e15713':
This commit is contained in:
The Android Open Source Project 2013-05-21 09:05:35 -07:00 committed by Android Git Automerger
commit 8b26ab2653

Diff content is not available