OSDN Git Service

am 5636617c: Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Nov 2012 18:24:20 +0000 (10:24 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Nov 2012 18:24:20 +0000 (10:24 -0800)
commit486ac23882dcca5998a8914f3f80e2597537ffd9
treeea253f59b19dd06fa647d16907d888a1fb0442e9
parentab003a084049320807f72341fa260ae133c13c73
parent5636617ce28f4ce2e5bb8a5bce35dbd57b79b14a
am 5636617c: Reconcile with jb-mr1-release - do not merge

* commit '5636617ce28f4ce2e5bb8a5bce35dbd57b79b14a':