OSDN Git Service

am 42dc6df1: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Jun 2013 00:02:28 +0000 (17:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Jun 2013 00:02:28 +0000 (17:02 -0700)
commitad0b03a76551292093fb924ec8ba2296ea7fcbf1
tree9b28faf1af2bf2f30db1c766633901c00c9389d4
parentd3b689984f88553b9bf59384a40c50af6a35750c
parent42dc6df115a0177f5459fecdf0236c73b1e2bdbe
am 42dc6df1: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '42dc6df115a0177f5459fecdf0236c73b1e2bdbe':