OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 25 Jun 2013 23:12:06 +0000 (16:12 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 25 Jun 2013 23:12:06 +0000 (16:12 -0700)
commitbfc53ab2def0d58872b70e7f4afb2ca184143ff6
treed2dee972cbda6f391d6f06e97cc805f26a8bfde4
parent52dbdbf2d10f4e53f76c40a0bed0ffe31301f1f0
parent8d41901e6669b5916f4fcbbf262445ca906e1556
parent2184e3e31be584b93b4c74413b3d654c3b7f3499
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: I9db90765647d0218de569565d7a23ab3c12ca044