OSDN Git Service

am 0165e51e: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Aug 2012 15:29:18 +0000 (08:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Aug 2012 15:29:18 +0000 (08:29 -0700)
commit1dd4bd8c45d8ea5bf591426b834b0f0d04003cce
tree483225aa0dd123a84bf5f2219a3bf93d104e19d0
parent6f0a274d63352b5cca92274f7de411e29da31025
parent443acd482323a84119d39102e1ccbb08ce6c01a1
am 0165e51e: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0165e51e46f034c238fb9c9520928b88b773bdc9':