OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 22 Nov 2011 23:23:59 +0000 (15:23 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 22 Nov 2011 23:23:59 +0000 (15:23 -0800)
commit24215999d0a9d603aeea3c88ceedfb8e36fcf947
treec93dd28f3ffa0a325e6641c18e229382854b0ddc
parent5cd44bd38f4d2158758a97e8a871a3b9cd6b6b37
parent54aa08fdbbe2eeb4c18e452bab92fbe28be5da85
Reconcile with ics-mr0-release

Change-Id: I3797edc6648a93700423b6ad4fb50d2e36c62bfc