OSDN Git Service

am 92b7fbf8: (-s ours) am 414aadc7: am 3bf2fcf9: Reconcile with jb-mr1-factory-releas...
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 19:18:49 +0000 (11:18 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 19:18:49 +0000 (11:18 -0800)
commitd15c8737ce3c38bfd762667dfc52a537a4b66c73
tree064445dc08e804a406ef039a5f655aef134da3be
parentd052eb6b47efe2ffb85e1bbd831a00d39f3ecccc
parent92b7fbf8725fed5bfa3cae7c26d09e813b3ae920
am 92b7fbf8: (-s ours) am 414aadc7: am 3bf2fcf9: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '92b7fbf8725fed5bfa3cae7c26d09e813b3ae920':