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:43:20 +0000 (07:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 1 Jul 2013 14:43:20 +0000 (07:43 -0700)
commit6ab277ee50d91bb6b50cacda55e84ac3afc4323b
treeab432afddac02e27bfcb73c0635829a1406e49ce
parent50702355f23d5e270727018c2af7cc76a1bd91eb
parent1468b78605443544c7a4c3174e71bc3000fb4982
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I6534b46c13c3ae03f703e70a546f54a59fc4adc0