OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 22 Nov 2011 21:26:03 +0000 (13:26 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 22 Nov 2011 21:26:03 +0000 (13:26 -0800)
commit29c7f784cc8cb7004d0da1a8721e7a5a715363ee
tree2129c5999e642714fdcc0a44bf9b2eedd146f702
parentebeb6eaef6bede377e03462a00c0df72971da6a3
parent77812a7de9091c0b9f57fd313bd5a28cc32fd864
Reconcile with ics-mr1-release

Change-Id: Ib3cb0799cd54228f43fa27fdf618cbcc0cea18a1