OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Sep 2012 16:09:05 +0000 (09:09 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Sep 2012 16:09:05 +0000 (09:09 -0700)
commit4e9fb84063a2ad84df45ade41d301ec3aaf06160
tree88ded1977b73276f93db557f58128bbb989171ca
parent9f413b77b05998b2dfe831d8752ba952f524b9ba
parent2bbf02c9b07369a6a9802486c50830885d873381
Reconcile with jb-mr1-release - do not merge

Change-Id: I1071ef79a7f5080b822cc4032647ea1feacd5d12