OSDN Git Service

am e6105c26: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Jun 2013 18:58:20 +0000 (11:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Jun 2013 18:58:20 +0000 (11:58 -0700)
commita2cf13c77260f98fc674f103dcbd2bb2488a80ce
treea4e930abd2479fe1f8b143e0b624e7e43950ef4f
parentd77312bbaa86c68f9f43a68b2786e8875769d3c4
parente6105c26a5b506f96e9fe1d3fec64a8b2ed1d6dd
am e6105c26: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit 'e6105c26a5b506f96e9fe1d3fec64a8b2ed1d6dd':