OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Jul 2013 16:36:30 +0000 (09:36 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Jul 2013 16:36:30 +0000 (09:36 -0700)
commit93351edefa033cade3c8f06729a1b2a73f70e18b
tree8093c01a27de6032e5e558f8daa2b2a309aa105f
parentae3be8a5f4df872a149cbfc537e315cbb6bc592b
parentb955041d0e7b9fdb9c4f45559e04b1f4fe81b589
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I9fe682604981ae07715422637fc4629d7e09937f