| commit | 16289de340c24aaf03b934896aa4b288f03caf6e | [log] [tgz] |
|---|---|---|
| author | Evan Millar <emillar@google.com> | Thu Feb 03 18:07:29 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 03 18:07:29 2011 -0800 |
| tree | 814444e476639a9eb28e1779ac28dc951a298d3e | |
| parent | 2b413b1d2ee9a5c3fc9242a96792c4d391b3f522 [diff] | |
| parent | 43c32002804cba96225b5e43fd78240b4f43d71e [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base