OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jun 2013 14:44:14 +0000 (07:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jun 2013 14:44:14 +0000 (07:44 -0700)
Change-Id: Ib2c2ee9efe4216329231a2bf4abc608ea662bc85


Trivial merge