am ec6745d7: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 17:09:13 +0000 (09:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Feb 2012 17:09:13 +0000 (09:09 -0800)

Trivial merge