OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 4 Nov 2011 15:31:35 +0000 (08:31 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 4 Nov 2011 15:31:35 +0000 (08:31 -0700)
commit7f7cbdfc2654121a3be8605f2d5dcf3011a025a5
tree338ae281a6fc0c402c946f6dd55cf25ddc7a584f
parent07b88daac3a120fdbbf893b3da4a0a27ebf00aaa
parentc0c433d0f87b3f05a9dd83d1afe1207503ed8685
Reconcile with ics-mr1-release

Change-Id: Ic37b4c137bcb0afe35a796aa8538ba50a8a7fb19