OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 18:12:39 +0000 (10:12 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 18:12:39 +0000 (10:12 -0800)
commit79ec613a66b71a16591bcd3bde5cb815f1a3d352
tree03c7df8f27c4d030f24755fdd8bd20f4d921d612
parente5cb62f5f4af389f21d950b7847f0df909a0225f
parent815b2f3467aa1d1e98be7a0e2e8e5a6a8c8094ef
Reconcile with ics-mr1-release

Change-Id: Icb875d44d67d0d2c6befa309453a464668289ccd