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)
commit090c669e69279c0dcbe5da2c262578b36a98ace9
treef33745891a4668aa8601ba76fb274cb0036ac027
parent8543578f108d703b7db8fbea3ab5e7f2e7c67483
parent862a3e7a9f31ba41f4a23a14bc84f9b26455ee23
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Ifabc6325c7c832b018cfca775680e3e90fc99832