OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 16:21:07 +0000 (09:21 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 16:21:07 +0000 (09:21 -0700)
commit3aeec65f6398183ea8dd086f4d33cbc32cbce8c7
tree1743e3b219f54649d475742a30ab3b0136ad9503
parent700b8cf87ee70fa5cba9ee09669aad07f983055a
parent13f393d69936fd1876c1c7045cc39b9b51e75254
Reconcile with jb-mr1-release - do not merge

Change-Id: I4024b1fab0705f6b943ef6b0633ad9e29beacb73