OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 27 Jun 2013 15:11:38 +0000 (08:11 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 27 Jun 2013 15:11:38 +0000 (08:11 -0700)
commit92ad5881b51c6762f71ced36b2ba34f3afe5b765
tree144b24d27f46e4068a1e3ecab1d204becbc298cb
parent426bf5adf0f6f3f5579ae2b97c2caaee7dae1fe7
parent3963f3cbe0809153597ae15a502b0f821e99e719
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Ib2d247987e12acb692ade4862ebe200585bb4664