OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 8 Nov 2011 19:08:20 +0000 (11:08 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 8 Nov 2011 19:08:20 +0000 (11:08 -0800)
commitd9a661544ea3c8d8b8ca35023e2102fb4e5f954f
tree003994e335f13de9e020a626dc41355b6a430256
parenta63aa0465321e1e0ff940043032bf6b6d385960d
parent771c2ba2bfd89ae0696a2530e1c79aa79fecea32
Reconcile with ics-mr0-release

Change-Id: I382741a2a6c99247d214583ee0488cf1ab9c3ce3