OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Jun 2013 18:56:55 +0000 (11:56 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Jun 2013 18:56:55 +0000 (11:56 -0700)
commite6105c26a5b506f96e9fe1d3fec64a8b2ed1d6dd
tree8d3e88e7f8638d62d7723daf349c504574a2c0c5
parent455479bc2c6a88746d4801f3f5a0e8d9f8609528
parent285aa3a997fb614402355e0296da681327dcd1cd
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Id1c9edbb5b7b398fb863cbbd79e673ab2c10df9a