OSDN Git Service

am b7a115c7: Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 22:22:22 +0000 (14:22 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Nov 2012 22:22:22 +0000 (14:22 -0800)
* commit 'b7a115c77ad4852aae5ec2ce30ea2b05f3dd1d75':


Trivial merge