OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Mar 2012 16:00:43 +0000 (09:00 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Mar 2012 16:00:43 +0000 (09:00 -0700)
commit044773292b82db6575b2234962564b5706aa1cf3
tree8e3233b2ef42a094d31d6eea8befbe8daceef9e5
parent0f5591d80245500b98f2d8d7477248a30a7b0473
parentbd98366df5cac3b7ea5b3cecde5fcb4d2731a145
Reconcile with ics-mr1-release

Change-Id: Id19190393a665dd1b07c073970925758aa383691