| commit | 222e480e6df0c47cad0644b3e951ccfc26db64e6 | [log] [tgz] |
|---|---|---|
| author | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 04 15:39:56 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 04 15:39:56 2010 -0800 |
| tree | 2fd8951882f4978be4818d56fee1fce0da3e4f44 | |
| parent | e4ae0266bcfde2c8d1ca8871621e91a7f8bcfc84 [diff] | |
| parent | c99584dd4b05e457b79d90de6856fb38e2087fe6 [diff] |
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base