| commit | 3b5966b0698fd982675d5169ee641d7b214f596d | [log] [tgz] |
|---|---|---|
| author | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 10 15:09:20 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 10 15:09:20 2012 -0700 |
| tree | 7783484dcb4c3c11f9203001f0dcda13d72bed12 | |
| parent | 97dbfc7ae3ad8b7daded35e3c3ad82a2349bf013 [diff] | |
| parent | d1ba68955947c208831711efdf2d6c4e5fb86d84 [diff] |
am d1ba6895: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp * commit 'd1ba68955947c208831711efdf2d6c4e5fb86d84':