OSDN Git Service

am 2b366f1e: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 11 Dec 2012 19:56:58 +0000 (11:56 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Dec 2012 19:56:58 +0000 (11:56 -0800)
commitd2d957d82a4274583b78d5684a0fb8d1b0210411
treefcb9a1e5c13a5880360386bd3456bea440b252c4
parente7597ec69557e4a90c78e35f1bf23b80372b4161
parent2b366f1eab4d723a9bf06c616b2d23c262164939
am 2b366f1e: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '2b366f1eab4d723a9bf06c616b2d23c262164939':