diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-08-18 15:14:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-18 15:14:31 -0700 |
| commit | 4600139173c80db4ebfb70e2417231e9678d37f9 (patch) | |
| tree | 1acc7e7c38b6742187ddd6ce3ebb2660ef563ff4 /opengl | |
| parent | cf2c68c9c21b8af62e95374312355d22ed55e586 (diff) | |
| parent | 6b2c56a299eb05deef2b887549e29e9e9f0f2cf6 (diff) | |
| download | frameworks_base-4600139173c80db4ebfb70e2417231e9678d37f9.zip frameworks_base-4600139173c80db4ebfb70e2417231e9678d37f9.tar.gz frameworks_base-4600139173c80db4ebfb70e2417231e9678d37f9.tar.bz2 | |
am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread
Merge commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6' into gingerbread-plus-aosp
* commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6':
DO NOT MERGE Do not kill sockets going default->hipri
Diffstat (limited to 'opengl')
0 files changed, 0 insertions, 0 deletions