am 0da73557: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 15:08:14 +0000 (08:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Oct 2012 15:08:14 +0000 (08:08 -0700)
commitdb39f67cfcdd55ace0fd1a94f166bc0abe8a7bc1
treeb075879d43b4be8148d23523f1a641ce9ff5eda1
parente17967badd09aa6b6e3e7d6a6baeaf585843aaa8
parent0da73557cb81ba7940894fedb6193447ed9a9b91
am 0da73557: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0da73557cb81ba7940894fedb6193447ed9a9b91':