OSDN Git Service

am 6c19776e: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 2 Aug 2012 22:09:11 +0000 (15:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Aug 2012 22:09:11 +0000 (15:09 -0700)
commit7c4e0b6cefec2e2e4ca419f60ddc3ed1761ec67a
tree3ae9b24b05f4b898ac84764229a83decd9b03c82
parent549e5dd1c51d4c9216014f500a59284539a46609
parent6c19776e9c8736b2f29f92e772469724cf55c1e4
am 6c19776e: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6c19776e9c8736b2f29f92e772469724cf55c1e4':