| commit | f197d6a8d2f59a1f7b7e6d84c812bb1706e2fbf9 | [log] [tgz] |
|---|---|---|
| author | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 14 17:10:53 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 14 17:10:53 2012 -0700 |
| tree | f144f6a606521210749419047db66417e1dcdc01 | |
| parent | 75bb45945249be1d2ab3614429d76ffb082cc7c4 [diff] | |
| parent | c600323c592e7985022766fca7706ae6a76db921 [diff] |
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp