| commit | 55fbbce495723a5b17f1b4684d0f9826c75caa97 | [log] [tgz] |
|---|---|---|
| author | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 01 07:35:22 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 01 07:35:22 2012 -0800 |
| tree | 24b117a5c25cd7dada11daf04a94ae54156be388 | |
| parent | da0c4a3ea653a866d6a8fe00bc52f27d0841874b [diff] | |
| parent | 353b61a87d9eb0ee223bdda76c30a1364441d962 [diff] |
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp