tree a611d06246c7e9beff0adc810e7eed0d30eeb965
parent 5c3bea702276bed21234715b497d683ef1b1f012
parent 10ff393a523e49c7c8f306c7c79eddf9b5ce8276
author The Android Open Source Project <initial-contribution@android.com> 1318332566 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1318332567 -0700

Reconcile with ics-factoryrom-release

Change-Id: Ibd1dca227b44e13538ea0b9f6aea45d180a010d3