| commit | d1ba68955947c208831711efdf2d6c4e5fb86d84 | [log] [tgz] |
|---|---|---|
| author | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 10 15:01:06 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 10 15:01:06 2012 -0700 |
| tree | ab03169ac53b03a597b41b13230a018b260f137b | |
| parent | bc8eaa7d63865ee2532014419a0e384c62c7027e [diff] | |
| parent | d87121f46efd48f63f3cd181c8ff081f11ff0feb [diff] |
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp