commit | a388a3245dfeea057bc7ec6b62e474994b3ff946 | [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 | b05a9fc4cdee8f6cc92a937308639314e8479136 | |
parent | d4e722b74f4a5c58db03dd94d79f192c0a9b3004 [diff] | |
parent | 09f1e2b2151ea18c05b9138a0a5cb63af18ea373 [diff] |
Merge branch 'gingerbread-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into gingerbread-plus-aosp