diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-05-12 07:55:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 07:55:55 -0700 |
| commit | a2740229c8290c82aa42b56d02dce7b0fc5eaaeb (patch) | |
| tree | 19ab3fba69bd9bfeb70b2823e48cbd9e2a132068 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9a77d1f27aba360d7fce3bd16827c7452d93b7d1 (diff) | |
| parent | 0904bbd87a734b259176da2b69a8fe3cc29ce5bc (diff) | |
am d2084bb6: am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
Merge commit 'd2084bb689bb680eb886d5cfbd27adc6f2e9da1c' into kraken
* commit 'd2084bb689bb680eb886d5cfbd27adc6f2e9da1c':
LocationManagerService: Call updateNetworkState on providers that are disabled.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions