OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Jul 2013 22:37:19 +0000 (15:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Jul 2013 22:37:19 +0000 (15:37 -0700)
commitff2b0d7f79283665ad3d1fee8a96b3455be7f91d
tree6eeee10bca8f85b8e70dce01b2111989fd19e22e
parent181192235d02e647a161a18ff442367ca8fe7f8f
parentf71e50214986d69441ac48855da9ea3f5cf6736e
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I5b0a5ed28f84d9e080f30feeec05975512a8b8f7