am 4fded8cf: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 30 Nov 2011 22:05:02 +0000 (14:05 -0800)]
* commit '4fded8cfdd2bed314c5238003cdaf974be6246e9':


Trivial merge