OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jun 2013 14:44:00 +0000 (07:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jun 2013 14:44:00 +0000 (07:44 -0700)
commit05e87d536ed2b7cf1d68135121b630031e5d56c2
tree17ae714410130417129ae3122f024bc2df2bc412
parent0cc754918a3c1353164ccc5798f63b28f65db406
parente8b887c512feed7bcfc06660cf626f26b986f479
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I2ab98a5fccea49e0f4e6d22fddca485ad50b63b8