commit | 476f15c0de4dea1388076c7482eefd154cc3ad3d | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 13 19:13:18 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 13 19:13:18 2011 -0800 |
tree | 34e2d995624564a64e087d4afa5223e6bfd230db | |
parent | a9960076efe46be2d98c72faa68f09fc28853503 [diff] | |
parent | 16bdd1e65ef19379bbede40c38de2e9f816ba35b [diff] |
am 16bdd1e6: Reconcile with ics-mr1-release * commit '16bdd1e65ef19379bbede40c38de2e9f816ba35b':