OSDN Git Service

am 5ae5e5e2: (-s ours) am 5a51d6a2: am b7a115c7: Reconcile with jb-mr1-release -...
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 23:59:34 +0000 (15:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Nov 2012 23:59:34 +0000 (15:59 -0800)
commitaf162c138024cb16e7b318f5e69dd14adc18db08
tree83d457d9e6a98560a2178e0d9a42d66e70433f40
parentf49c589cf6f9d4bce577d7e71e7d012469ccc59b
parent5ae5e5e2a9f2fe2f517749b1cfb8049e1a89577d
am 5ae5e5e2: (-s ours) am 5a51d6a2: am b7a115c7: Reconcile with jb-mr1-release - do not merge

* commit '5ae5e5e2a9f2fe2f517749b1cfb8049e1a89577d':