OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jun 2013 14:44:14 +0000 (07:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jun 2013 14:44:14 +0000 (07:44 -0700)
commit28b13ba10d8e1ce2b29ee548979ab347ec0b8e9e
tree0f1da191b71d17c45da3dbc8d35dcf3f36dd1ecf
parentfec773ccc9b92353a986bcab69e07d36ed31e16e
parent7fcbe6d301777c4977df00143717ff673cb603f2
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Ib2c2ee9efe4216329231a2bf4abc608ea662bc85