| commit | 6be4fe371a6c24916789c66bf39d73cada779079 | [log] [tgz] |
|---|---|---|
| author | yoonsung.nam <yoonsung.nam@samsung.com> | Fri Apr 06 09:49:43 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 06 09:49:43 2012 -0700 |
| tree | 62843ab5ff6b3f6a3ee9082834b70f95d80d7562 | |
| parent | 7b5f48f48aad69cb94af30cebdf062f7710a9125 [diff] | |
| parent | 2adda2d594954d338993f579503ab3e5f339ac8a [diff] |
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp