OSDN Git Service

am cb7f5b94: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Jul 2013 22:52:25 +0000 (15:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Jul 2013 22:52:25 +0000 (15:52 -0700)
commit1d9b1834689d694802dea4f9a10f00a8b7c21d12
tree0cc8454584b5123983fd8d7512d6d2f33dd0cb76
parentea83a4b7afa1e78ebcd4bf418967888260f5461a
parentcb7f5b94a3d683f297ddf839ca4aa897e0927139
am cb7f5b94: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit 'cb7f5b94a3d683f297ddf839ca4aa897e0927139':