OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Dec 2011 15:19:46 +0000 (07:19 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Dec 2011 15:19:46 +0000 (07:19 -0800)
commit2c49911b21b275810ddcde0d2bcebf900099d02d
tree21e05b99b757953d0e598eadd00664c15836941c
parent9fb7b17c465e6cf38681ef7742ee1a0a486c5b79
parent52303c68fe16fa6bf83181c7f3dee59a704a78d2
Reconcile with ics-mr1-release

Change-Id: I35894bf1394fd007afa6cca910b2d9ae18ffdb49