OSDN Git Service

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


Trivial merge