| commit | bfdb5bbdca0cdcb1c205846860d4916b65bdc2e2 | [log] [tgz] |
|---|---|---|
| author | Jason Noguchi <jnoguchi@google.com> | Tue Apr 03 16:15:34 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 03 16:15:34 2012 -0700 |
| tree | 336d8d8f4db9973aba71c23453338853cbada8d4 | |
| parent | 9c0fe75c392936327edf9fb449b13ad130b6140a [diff] | |
| parent | 306d1180fda2e471eb27310e9753d87e1bebf1ca [diff] |
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp