am 2e1be175: Reconcile with jb-mr2-release - do not merge

* commit '2e1be1756081ef7300c42f2e7906c316539d7930':
This commit is contained in:
The Android Open Source Project 2013-04-08 13:40:28 -07:00 committed by Android Git Automerger
commit 5cad711976

Diff content is not available