OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 31 Oct 2011 20:19:29 +0000 (13:19 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 31 Oct 2011 20:19:29 +0000 (13:19 -0700)
commitd076de27aa76a701c033e7b3d835cbd210861e30
tree5de4d74ebe8fe984aac122c34a360012f89eb361
parent80fe82c0481d36d6c4c09fa631fa7010a20a32f0
parent2dfbe90d8fbda95f9fd2b78a0ccd06d459cf72ce
Reconcile with ics-mr1-release

Change-Id: Icedf366b2ea11de0f8b0f6107a549ccc2f97a58e