OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 31 Oct 2011 20:19:40 +0000 (13:19 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 31 Oct 2011 20:19:40 +0000 (13:19 -0700)
commitc1bddc1cf954a289f6ba757ff63c8d8712cca49a
tree593692288e321337f6bf47d5257add7c5ab600f0
parent4bde0988804020b42fb669a1e99d9d97bb99504f
parent3d1454e31c4dba76420180a8486d4b8fb8151023
Reconcile with ics-mr1-release

Change-Id: I89995f978dbd3c063c1f5f6a815c609f7e962d87