OSDN Git Service

am 44291d2f: (-s ours) am 6fbc2f19: am e7e77c4b: Reconcile with jb-mr1-factory-releas...
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 19:28:31 +0000 (11:28 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 19:28:31 +0000 (11:28 -0800)
commit929cea3b026e94f13938808a00f9b4a4623199b7
tree3222eafdaed6a52273a00bb318bd4656fb9072b3
parentf72e1f2c68a31984f656a8abc8765c8a6cb71c9e
parent44291d2f2cdde221312249161d4e61c54c19225f
am 44291d2f: (-s ours) am 6fbc2f19: am e7e77c4b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '44291d2f2cdde221312249161d4e61c54c19225f':