OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Jun 2013 15:14:04 +0000 (08:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Jun 2013 15:14:04 +0000 (08:14 -0700)
commit55a3c0dd0d34a17ca966ed1652e7d7ba9deb3240
tree006537295c0cbdd24be22fbf5402a17917706b76
parent57e90a2a67144aa37fc2b6905c9c011589d4c99c
parent0fe375a333a6fa5a035792377d8238d39ef1974f
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I5a0af2cc544c873654fb328b96b0bf1eed32d4ef