OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 1 Jul 2013 14:42:42 +0000 (07:42 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 1 Jul 2013 14:42:42 +0000 (07:42 -0700)
commit4a5fc6964313a606abd89268b8a53036b14b4ad7
tree2640c74d21cac6b2463c8a4af01af1948e35e906
parent2e1880d46eeb8fe1a53ac9e387a07ac802491ad7
parent473eb94da72d9ded823b1ed16a197a8dab41d2ea
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Ib88a72e7473f38fd079a12658875dec71352c19a