OSDN Git Service

am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 22:14:14 +0000 (15:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Aug 2012 22:14:14 +0000 (15:14 -0700)
commit4325cf22ef3d381bc9d28d264571ba305da94d57
treec6486a5a6cf8e8a25a6560f8b0fd7675e01a902a
parent6ac8bae6a927c918391224277ff3c1524e7565a4
parent7e107a0903707876c0ad7dd4ee2702fd5baed7ae
am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '7e107a0903707876c0ad7dd4ee2702fd5baed7ae':