OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:50:34 +0000 (08:50 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:50:34 +0000 (08:50 -0800)
commit79c31703151da5eaf8fb74a249091ddd54d0c2e9
tree3d3f43cf3cb074bcdfc9075e9fe850152c391027
parent8f568da373699781beb11cfa46a46c5871288353
parent6e395241e88847ceccf1c0a4e9d743da41293dba
Reconcile with ics-mr1-release

Change-Id: I65ae67dd34f8ee65190369e77739b02e9937ab6c