commit | 90f2ee948bd834ac27977b0d7196e725b5123750 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Feb 16 10:14:01 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 16 10:14:01 2012 -0800 |
tree | 6b926ec646a5f258b9f12d0ea469c6b1a6405908 | |
parent | 1a58855d5d60ed3237c78b3606aca88ed5e1d10b [diff] | |
parent | 41f7d2d9e48af6971e7346c69cbc00cea470f9d9 [diff] |
am 41f7d2d9: Reconcile with ics-mr1-release * commit '41f7d2d9e48af6971e7346c69cbc00cea470f9d9':