OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:03:02 +0000 (10:03 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:03:02 +0000 (10:03 -0800)
commit7b2763021750a2d138eaa20ee2d2828d83d1720c
tree60016441bf086dccfa57308a7bd4d767c5836f86
parentecd9c570f767040e8c021aa6ed995894c0d8d754
parent7ca9dcbdff2b93eadb983209a507ee0d60c7a5c5
Reconcile with ics-mr1-release

Change-Id: Ibe6997bc5295b3deb615e8f51f73a1639d0f3235