OSDN Git Service

Reconcile with ics-factoryrom-release ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Oct 2011 15:48:41 +0000 (08:48 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Oct 2011 15:48:41 +0000 (08:48 -0700)
commit3a8c9a112e3cf44f79a4ccfc2e922e9495a85292
tree2e4109858d76593fccb736ebc1f3bcd76ed85e5c
parenteee20ca405c886773104ed063124b5f5a80c6f77
parent137b552fd3b3171550bc3b50e668eb861b27a560
parent06a1b866cd0a95d46c15c8ab9e6926bd85b76e90
Reconcile with ics-factoryrom-release ics-mr0-release

Change-Id: Ic2b248f0ade713e7ba984cbe093afe50bc931ad2