am e5d0f31f: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 18:05:58 +0000 (11:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Aug 2012 18:05:58 +0000 (11:05 -0700)
commitf622626db5127139e6907182d99f779002cae2c9
tree95ea0e8696cd356989e832b612730f934e4b0632
parent8ef0777af8d46f47d16141cd2bb1189d13f784f7
parente5d0f31fc8fbf2542890b5c56e29f3bb9f757bdb
am e5d0f31f: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'e5d0f31fc8fbf2542890b5c56e29f3bb9f757bdb':