OSDN Git Service

am 78b012f5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:24:38 +0000 (12:24 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 20:24:38 +0000 (12:24 -0800)
commit33cf49b168a88a88167c46b01787a57b49cd875f
tree9cb42c78836745884fb27d823740fd26972db1f3
parent3b31d805517c0bde8a0ebed219cbd4b8409c71c2
parent78b012f5bc05706d1ce412811ccfaa9385dae0ab
am 78b012f5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '78b012f5bc05706d1ce412811ccfaa9385dae0ab':