OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:02:06 +0000 (10:02 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:02:06 +0000 (10:02 -0800)
commit6532f0e55b4340fe91a1097d3ddd72282b4de50d
tree8d5feb7e5a3dc256467308e7d0c4aada5a016816
parent605643224e096c43602c2e0e229410fa387e3331
parent1426e71355828a1f714cc68280965dcec40ecaf4
Reconcile with ics-mr1-release

Change-Id: I3cf7e38adf5847f0b3327c738cf38c0df9abcdea