OSDN Git Service

am bb3a943d: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 15:25:38 +0000 (08:25 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jun 2013 15:25:38 +0000 (08:25 -0700)
commit93420eeb38139bef8b7113582343339239dd3174
treeb95a2c4beb6ab3a8660af77933357c0c75c82637
parentff8fbf095665cf10922957d90317bc6319bbc3dd
parentbb3a943d1bd9cb8f7cca76850d432cfb2a6307e1
am bb3a943d: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit 'bb3a943d1bd9cb8f7cca76850d432cfb2a6307e1':