OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 17:35:05 +0000 (10:35 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 17:35:05 +0000 (10:35 -0700)
commit50e6290628264678012d2b21b7edd10f574e26dc
tree533234845fec7e313d2285786a451955a3906d0d
parent1f92cd44579fcedc9890070f60b7f4788916e5ab
parent38221406a7aefc9cd2c67ff8c8f60c7e947c65a5
Reconcile with jb-mr1-release - do not merge

Change-Id: I70fc7419598ce4c0f9aba005b8ade9d4f6682d2a