am f1c794aa: Reconcile with ics-mr1-release
The Android Open Source Project [Fri, 18 Nov 2011 23:46:31 +0000 (15:46 -0800)]
* commit 'f1c794aae7980595f15efd8398ae3148e8ed154f':


Trivial merge