OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Jul 2013 16:32:27 +0000 (09:32 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Jul 2013 16:32:27 +0000 (09:32 -0700)
commitccf2f3dd142d0ad973d913990a358d7fc6af2a8d
treee4b6a73289eed397439b113f2b821f93ba5ab2ef
parent6e9151b1a7e035936cf671c83cf25fe7351e3c06
parent566c698fe76119cdeb3ee816c3e42f0ef7725d78
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I2c1659dba0eea86a4a76ee410608febbae466ef2