OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 15:22:53 +0000 (08:22 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 15:22:53 +0000 (08:22 -0700)
commitbb3a943d1bd9cb8f7cca76850d432cfb2a6307e1
tree1c502a5d9cd987173350e78997be1e517b34c4d3
parenta5520e76911421956c7c4fe4e28ac60c64a276b9
parent8720f867c4c292bf71a73078ec287392ad7ed788
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Id19d096814424b1c1253d633f9bc0e18d53dc360