| commit | 4ebcb9c7c003bc032c572737aa261cf240192271 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Jun 16 14:04:57 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 16 14:04:57 2011 -0700 |
| tree | 02a86dc22485fd8ce11695a5684f670154c34610 | |
| parent | 0ec630ff0e555921945c18a8525697ed49b4833f [diff] | |
| parent | cbeb66b8014dc041c91fbc04c5579973b261fde2 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base