OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 11 Jun 2013 21:56:39 +0000 (14:56 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 11 Jun 2013 21:56:40 +0000 (14:56 -0700)
commit31b161cedce884cb7a1426f810d4e1cba9d33f46
tree18edaa92da53733b027bb753a10cdaa472e98e07
parent6345230095ac4ac7eb45c71caccd5a4b02942a8e
parentb6a48228f9738dd9c11f3584853e31caeedc45ab
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I40a07d0eebc9a1ff517241b9788f30c047a62692