OSDN Git Service

am 6ab277ee: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 1 Jul 2013 14:47:44 +0000 (07:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jul 2013 14:47:44 +0000 (07:47 -0700)
commitc40e5ffff9700ec63a5bb08600a8f18301037a20
treeffc629645d1fa477300ea77749aefd896614f775
parent902d1bc4842526a6d938e4e6f4c3686c9ff45d94
parent6ab277ee50d91bb6b50cacda55e84ac3afc4323b
am 6ab277ee: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '6ab277ee50d91bb6b50cacda55e84ac3afc4323b':