OSDN Git Service

am 7a63def8: (-s ours) am 5ab56553: am f8fbfd9f: Reconcile with jb-mr1-release -...
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Nov 2012 15:34:10 +0000 (07:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Nov 2012 15:34:10 +0000 (07:34 -0800)
commite12b59b3b9391e807811020fba1976545e4495ea
tree62c2ce4f1f892cdb1750e703cafc1d51dc94d12e
parentbac65450c3de90ebeb1425147771d3b59e2de70d
parent7a63def870ef9089c7ee28e839a80a6544830e11
am 7a63def8: (-s ours) am 5ab56553: am f8fbfd9f: Reconcile with jb-mr1-release - do not merge

* commit '7a63def870ef9089c7ee28e839a80a6544830e11':