am 7e62209a: Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 24 May 2012 16:08:25 +0000 (09:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 May 2012 16:08:25 +0000 (09:08 -0700)
commit8e5d7b0e4e7abd1fc0c200be8b63220e2a982fc1
treeaa21ba3bf5db9619e49989cef9a83cf1d883ed75
parentcdab4be364f8d9186a96d4988a04ec127d0c58a5
parent7e62209a5ebd83d92ae51f4872723cb7f1a854ae
am 7e62209a: Reconcile with jb-release

* commit '7e62209a5ebd83d92ae51f4872723cb7f1a854ae':