| commit | f21dd1eabe5bf4da0dc0d9c23144aa997c05a56d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Oct 17 11:32:08 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 17 11:32:08 2011 -0700 |
| tree | c964eebbf3c2ea6c50532d57fd895989956f33a7 | |
| parent | c831f6c9799e13d7fde167abfa9c03eb5ab0827c [diff] | |
| parent | 7f7362c02bcde8750e24781f5c7199f9551301c5 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base