OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:42:31 +0000 (08:42 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:42:31 +0000 (08:42 -0800)
commit402e36f189cfa1de55deb575da2c34d97fe95389
treefa3a7072ee3a1f600c43a79889f2b16567ae0fb6
parenta57f538a22b99ae0e72e18e95d19635d2e6e0762
parent9ffda11f199c88c55c46f3258670fe19a9575cdb
Reconcile with ics-mr1-release

Change-Id: Icc486a00d6c067c87364023fcf7226686dc0642a