OSDN Git Service

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


Trivial merge