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:13:54 +0000 (16:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 25 Jun 2013 23:13:54 +0000 (16:13 -0700)
commit42dc6df115a0177f5459fecdf0236c73b1e2bdbe
tree14b1cbff4f27161f065c6d999d693194b13d3b31
parent2295035a85b02d1b876bb76093cfcafa890ff0fb
parent51248d42a07350bd44d173abffacae43203879c2
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Ia9e51b0778c662f1da131e33627cacf6356898fc