OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Dec 2011 15:10:41 +0000 (07:10 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Dec 2011 15:10:41 +0000 (07:10 -0800)
commite7a33465ac64218e146d72b2af0fd3a862128be1
tree0478a79b38309256c4d16d9664c89d1aedb1117d
parent424e8787c958829fed7f5020f23e4a02b86d0ec4
parent5df6892ebdedf038759195e88da9c501680365e1
Reconcile with ics-mr1-release

Change-Id: I7267a0f90aad28d4698b6c7ebd0e69e9dcd6ade6