| commit | ffd23288241f3fd172fb863ba2b328587095ee63 | [log] [tgz] |
|---|---|---|
| author | Steve Howard <showard@google.com> | Thu Sep 16 13:56:25 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 16 13:56:25 2010 -0700 |
| tree | 81062599a1c9c33938947ada9a57c71aa5f3cd55 | |
| parent | 11ad16f2af12518ea1c204462a44e2490e216b77 [diff] | |
| parent | 356d41cece08f5e9e52c4c0acaa4f3875b2ca32a [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base