| commit | 2f635c11e71b444f3b0120e89b58d9ca40a135f3 | [log] [tgz] |
|---|---|---|
| author | Yu Shan Emily Lau <yslau@google.com> | Tue Jul 20 16:55:33 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 20 16:55:33 2010 -0700 |
| tree | 06bbd40083a1bfe3694b0ba46f58f71878d9c2b4 | |
| parent | c9463503292985430e241badb6ccdb891823541d [diff] | |
| parent | 65c2d8ded38f8a2e07f0810ca61cff8c2111f40f [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base