| commit | 34483e7494ac9e0e3215fbb4490f0f69a615058b | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Fri Apr 29 14:56:59 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 29 14:56:59 2011 -0700 |
| tree | aa1bfc07a0100602f75d30bb7557e1bfa4d673b5 | |
| parent | deed89f4689c1919573fd836536932201e435e39 [diff] | |
| parent | d044b569134b44e5138e0be07b83e5a292c70616 [diff] |
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp