OSDN Git Service

am 8bebe981: (-s ours) am c6102390: am 209cdc3b: Reconcile with jb-mr1-factory-releas...
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:34:00 +0000 (12:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 20:34:00 +0000 (12:34 -0800)
commit0572d72cf787e9f3d0d60c6f2198501a8ca2f238
treed708a0f0d49c62de4ec342904b31173d3a26fc6c
parent1f1d0235fed769c4277d9da072a270addd1854d6
parent8bebe981e5a347a6f99d6916f689fcaf9cd29c8f
am 8bebe981: (-s ours) am c6102390: am 209cdc3b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '8bebe981e5a347a6f99d6916f689fcaf9cd29c8f':