OSDN Git Service

am 4afcf0fd: (-s ours) am 286e9cd8: am d7545049: Reconcile with jb-mr1-release -...
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 23:59:31 +0000 (15:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Nov 2012 23:59:31 +0000 (15:59 -0800)
commit109f79a1bc2c5081ade7770507541326747ac667
tree83d457d9e6a98560a2178e0d9a42d66e70433f40
parent0cd4a69a2629f7a2cee7400243ee7c0136e11e9e
parent4afcf0fdb85a2c7fa7ffbd60312dd9569021b3fe
am 4afcf0fd: (-s ours) am 286e9cd8: am d7545049: Reconcile with jb-mr1-release - do not merge

* commit '4afcf0fdb85a2c7fa7ffbd60312dd9569021b3fe':