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:49 +0000 (09:32 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Jul 2013 16:32:49 +0000 (09:32 -0700)
commit59734490f6a4f46308c39368a7b20f4fcf5e0e97
tree6133abc9250d2559df10f51a6aff65a230461d97
parent45130c62e1a17887bd27f12c834609159bba1c1a
parentd67c55b8d029b1934afe3503b1d180bdba504597
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec