OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Jul 2013 21:20:38 +0000 (14:20 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Jul 2013 21:20:38 +0000 (14:20 -0700)
commit184937322b767748f4d65758616cc9db2d670564
treedd779b676d0b687e3fb2c1e3f4b6b1a9a4aef6f7
parent63c1477ea9052118e3a991c903655b6ed04bd7b9
parente7ccc40240b72272737d4f25041e4b1374f20b09
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I0e4867b931bdee95e581e2769b182814cb23a531