commit | 057da22c3026137e9bf4705c515f41db78b51638 | [log] [tgz] |
---|---|---|
author | Erik <roboerik@android.com> | Fri Sep 10 10:07:25 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 10 10:07:25 2010 -0700 |
tree | 3a3e8b93d010e337d289c228cd6109a2ba412d93 | |
parent | 778f695119bf1d1b44317cfa093189093ceee152 [diff] | |
parent | 57cbf0857f1bf91310302de27c7050aa08acdbfa [diff] |
Merge branch 'gingerbread-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into gingerbread-plus-aosp