OSDN Git Service

am 96b17f8e: am a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Sep 2012 16:01:43 +0000 (09:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Sep 2012 16:01:43 +0000 (09:01 -0700)
commitb11ab8578b997a5d2bfc93b13c1c71396c60a03f
treec2e98ffe144c5f5169864118b245b5353fe21cd5
parent01cf231cbafe5cfba571535f967bcc5d1830385f
parent96b17f8e9972cb69e2ae8ce9cb137ecc6ca7763a
am 96b17f8e: am a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '96b17f8e9972cb69e2ae8ce9cb137ecc6ca7763a':
  JZO54I