OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 15 Dec 2011 03:57:24 +0000 (19:57 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 15 Dec 2011 03:57:24 +0000 (19:57 -0800)
commitc7185534d323aa13af3bda77a2e0e232306be89a
tree884ff4d5dedcb3b2bdcc4d2905c347353e49cdd1
parentefe3034c7107f80e99016bf1808cdfe1afe03e31
parent769631608c109743b9f14c05b4eb4d9dc60a3ab1
Reconcile with ics-mr1-release

Change-Id: I13575fbc40df854f574e7eaf8cfee6153ab3a342