OSDN Git Service

am 8c1845a6: (-s ours) am 76cbd841: am f4316f6d: (-s ours) Reconcile with jb-mr2...
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Dec 2013 19:21:35 +0000 (19:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 19:21:35 +0000 (19:21 +0000)
commitc3835eae2336e3d42e28f0a8c712238e4fe12701
treeb16abb32163358771fd4f484babd9bc1068471a6
parentbf3d3f8fd015a834aaf54051cef1805f0b4a241f
parent8c1845a6d669b03c2827965042f2e47e49f2d6b1
am 8c1845a6: (-s ours) am 76cbd841: am f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit '8c1845a6d669b03c2827965042f2e47e49f2d6b1':