am 3ddc6cc0: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 7 Jan 2012 02:18:41 +0000 (18:18 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 7 Jan 2012 02:18:41 +0000 (18:18 -0800)
commitca11088a57d3066408fb35d30551a0fc743a17a3
tree5ab9f76569061a0705159ae306719f1b647734f2
parent23bb4b4fb4076d09959b35f3e1247941ef7066c2
parent3ddc6cc0e16136d863df51a8e0e36b0558dcde62
am 3ddc6cc0: Reconcile with ics-mr1-release

* commit '3ddc6cc0e16136d863df51a8e0e36b0558dcde62':