summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2011-11-23 09:23:46 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2011-11-23 09:23:46 -0800
commit070e712fb3037b28e81340eb2e4fb53d1539130d (patch)
treec93dd28f3ffa0a325e6641c18e229382854b0ddc
parent24215999d0a9d603aeea3c88ceedfb8e36fcf947 (diff)
parent13315dd2ca9c09913f0b8f2f6d0e7f923394f6bc (diff)
parent4e776f342a07c796dc0717475d6d28ab6c517718 (diff)
downloadbuild-070e712fb3037b28e81340eb2e4fb53d1539130d.zip
build-070e712fb3037b28e81340eb2e4fb53d1539130d.tar.gz
build-070e712fb3037b28e81340eb2e4fb53d1539130d.tar.bz2
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: Ie10ba0ee48e3f7230c8613b63a6d9b1856b260c6