diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-06 15:22:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-06 15:22:17 -0700 |
| commit | d37aff7dff9cb3a052d233466ee39abc2359ea24 (patch) | |
| tree | 95f571bce595bd01cee3160711fcbb447afa3fc5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5934c599f5ac4091e4a44c278e0f8b6e95951a6a (diff) | |
| parent | 3877d301aaaec0590fe815ec6185ea646e59aaf3 (diff) | |
am f4dffd8a: merge from open-source master
Merge commit 'f4dffd8a45386b5a5f0e6de4f30facc9eaac4001' into kraken
* commit 'f4dffd8a45386b5a5f0e6de4f30facc9eaac4001':
GpsLocationProvider: Store new Location before onGpsStatusChanged is sent
Telephony: Add PUK MMI code support for CDMA RUIM phones
Type Zero Sms should not be displayed/stored/notified.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions