OSDN Git Service

am 5acc9098: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 18:08:26 +0000 (11:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Aug 2012 18:08:26 +0000 (11:08 -0700)
commitab1db58b5db32762e9d618d910e573af5a40e04b
treef37813df98ef1b4007d5747874b1d88148513d6f
parentb0280b7dfc59c6d34dd14dbcdfa8e773d8cad113
parent5acc909860388a8863e3ec9d38a290fd418cce22
am 5acc9098: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '5acc909860388a8863e3ec9d38a290fd418cce22':