OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:49:24 +0000 (08:49 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:49:24 +0000 (08:49 -0800)
commit44eae4c7af901e521e2e880a8300b285bbf53010
tree7672e9c24da57867c389a5129e59934b3197f6a8
parente8e1efeafb8754ea8358e78cfe3d0f7ad4e809b2
parent3d11bf0f3f3cf848f6f1e8449bf8736d8d1c78a3
Reconcile with ics-mr1-release

Change-Id: I37e2eb5cd34a47e3eb7b2bf2353b50fc14972adf