| commit | 090cb44b945bfe2711344a5331814bd6412ab437 | [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 | 53ec3dbad4348124bed96fed8500d77bffbb551d | |
| parent | 35e9fa48918924302cdb248ff5e816d697066bde [diff] | |
| parent | cb2de7182ee689cdb77242474def26938e852bf3 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base