OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 22 Jul 2013 14:59:15 +0000 (07:59 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 22 Jul 2013 14:59:15 +0000 (07:59 -0700)
commit90a4ac4c1eafd897800c72fa8c732f97ffa95d28
tree9816b25a4d8b4c0505c49eb1e8873e69758dfb30
parent62eda460c411b21dce28b8ea6a9ee9245d896dd5
parentd90fa5ddf57828fe6e24ee1855fc4862ae9adc7b
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I6f1b8561853187e3a82f0da2e428188c10e64807