OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Jul 2013 14:35:31 +0000 (07:35 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Jul 2013 14:35:31 +0000 (07:35 -0700)
commit8c20de34bd3302b6a594b33afab4ff90303a5dde
treeb9e37fa213a40bd5e9f77b294d3551cbd2a6f92d
parent3aa8eb6810e523f6056da58079f65e5fbcd628d0
parentdff14e56cdcb4fcbad483e845920236131ea083d
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Id93477c002befa42eda6aafe3a71323e28ca8ab0