am a67beb7a: am 13a08957: Reconcile with ics-mr1-release
The Android Open Source Project [Fri, 9 Dec 2011 23:03:33 +0000 (15:03 -0800)]
* commit 'a67beb7a4c2cec6ebaed61bc64157a9138812f9e':


Trivial merge