OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Jul 2013 21:52:07 +0000 (14:52 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Jul 2013 21:52:07 +0000 (14:52 -0700)
commit29b708aac70b694879d4867e1943926716a08fea
tree29c3c1123716cea86332a4d51cf7abb1246fd187
parent263359df4399e86a26a70711b8004b54c8fe44b0
parent7712d0ca94f7ee2e205c9dfd496c40b58cc04b92
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I2025eb92f81ab9ce86e3f894f3e25eb5ca4266ec