OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 25 Jun 2013 23:12:03 +0000 (16:12 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 25 Jun 2013 23:12:03 +0000 (16:12 -0700)
commitbdebd4817cfe49fafedfe8f9c65930e03f9b508b
tree8d3e88e7f8638d62d7723daf349c504574a2c0c5
parent1aee0be6cc9ecb4ff3d86228bb68c295c12bde9c
parent31484d8d90e4861a848ce4f2fbbc1ddeac8d0a87
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I4de46f3bfcfb80867bbeb52a76d383f5870e74f4