| commit | 20801d679f2815f12ada84704024b1e3c885da84 | [log] [tgz] |
|---|---|---|
| author | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 28 10:49:07 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 28 10:49:07 2012 -0800 |
| tree | 09b9b21af72d3ec57979d8cde93c63b72e2db7cc | |
| parent | c502f3b6de83b64df36a9ff76ab3c803aa89feab [diff] | |
| parent | c1a5853a7c7b83074a4bc8ff9483cbe231534607 [diff] |
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp