am 462002f8: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 13:02:10 +0000 (06:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Oct 2012 13:02:10 +0000 (06:02 -0700)
commite17967badd09aa6b6e3e7d6a6baeaf585843aaa8
treeb075879d43b4be8148d23523f1a641ce9ff5eda1
parent2c0842f28478fbfb2447d5ebd613d69b339bd2c3
parent462002f84a1e2a0354b67d11f8b445b60c8ecf82
am 462002f8: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '462002f84a1e2a0354b67d11f8b445b60c8ecf82':