OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Jun 2013 14:23:36 +0000 (07:23 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Jun 2013 14:23:36 +0000 (07:23 -0700)
commitcd9482d961d1c14b6dea7279f8524e29908b6a27
treee664bb62db87ff89580d17caacd2af3c87457cf2
parentde836890abc7b5381e285833052375cbb85730cb
parente082dd6df20e3f3b4f9ff8063e738cb18a8a6952
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I02e004028811a3efad8c010ed19e216bb87814d7