OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Dec 2011 15:24:54 +0000 (07:24 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Dec 2011 15:24:54 +0000 (07:24 -0800)
commit3de8d36b6fd166cf63ca256c455c0ea26a849668
treed9eabbdf1f699103301cbdad7d0dc5fa0f4a4ae3
parent8a4cd3b1053d92ecb34628218f303343746691f4
parent81cab1752ea95c5772a2141602c8654360c18896
Reconcile with ics-mr0-release

Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47