| commit | d1f4a17ea580a0478932993868a0d39d993aec61 | [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 | e275e29435c87b6058d9b04924628ab418df36a1 | |
| parent | c5eeedc93d7b9633d59fae7bc21a22a0e78fa373 [diff] | |
| parent | f20d6cf100eae9538ca4bc0cfe0ec90ddc4f5c13 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base