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)
* commit '0165e51e46f034c238fb9c9520928b88b773bdc9':


Trivial merge