am 7106a91c: (-s ours) Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Tue, 21 May 2013 16:02:37 +0000 (09:02 -0700)]
* commit '7106a91cff7bd3578eb8c07b4348c9c262f89bb8':


Trivial merge