| commit | 7ebdcbdb6f3314ffa3f3817ed62251b8973179fa | [log] [tgz] |
|---|---|---|
| author | Tom Taylor <tomtaylor@google.com> | Tue Dec 29 20:11:00 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 29 20:11:00 2009 -0800 |
| tree | 44d7ac9ca4620f1db10c0cd6cb57570b95f130a4 | |
| parent | a0b517609dfd8436a98bdebb31466f19ffec6cb5 [diff] | |
| parent | 0ac7f0b8c351209952890340b9b8ee7a2159b6b5 [diff] |
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base