| commit | 09d1442bf6fbdeb271db3dfa5709889d5e4c6627 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Apr 03 15:37:14 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 03 15:37:14 2012 -0700 |
| tree | a5a3e321aefa0c2532b0daf8ebee95774b1a0977 | |
| parent | 793553b4f09213cdf8b580318f4a9c0b1f4dc0fa [diff] | |
| parent | 0f9e4bc54411c7e1c1f08299282a8bd0cd9b8d34 [diff] |
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp