| commit | 3196f0b134d60eae351cc1727dd5ce12c4ee6cdd | [log] [tgz] |
|---|---|---|
| author | Marc Blank <mblank@google.com> | Thu Jun 02 10:43:11 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 02 10:43:11 2011 -0700 |
| tree | d22b6e74ceca0cc372ef3956198779d7b63c9b46 | |
| parent | 32e15ba3c8d2b75141631ca3db3b6a985efe4ab3 [diff] | |
| parent | f0e2131e2e846b41f8745f91ee82c444fad53cda [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base