| commit | d1bfd5a29ef72342c7310c9e3128ad7d5d4a27b5 | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Fri Sep 10 15:06:38 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 10 15:06:38 2010 -0700 |
| tree | 39302472f4d2e742d5de39b24bf00c2f1f14fb10 | |
| parent | a9c0d5051f95dc2effb7041db9833d4abfbe0887 [diff] | |
| parent | 2b063a8f856cb82369efc116444254d57a554605 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base