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)
Change-Id: Id19d096814424b1c1253d633f9bc0e18d53dc360


Trivial merge