OSDN Git Service

am 7f5a3d10: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Dec 2012 15:36:21 +0000 (07:36 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Dec 2012 15:36:21 +0000 (07:36 -0800)
commitd870df94b2d298c3f180b51b14251628ae7be4be
tree35305422b55808a435989db284e24fb4cf3842f1
parent1d6bf8d46b07cb87d5842324190bc5a31eee5e4b
parent7f5a3d10f860ee1962c4bb81fa5a552cc5fedc3e
am 7f5a3d10: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '7f5a3d10f860ee1962c4bb81fa5a552cc5fedc3e':