OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Jun 2013 18:57:13 +0000 (11:57 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Jun 2013 18:57:13 +0000 (11:57 -0700)
Change-Id: Ifabc6325c7c832b018cfca775680e3e90fc99832


Trivial merge