diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-12 15:06:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 15:06:13 -0700 |
| commit | 400bb7ce309e979bc377f25b5e50e1ab112df9f7 (patch) | |
| tree | 75a8d59531c4c48d63d8408d74d09d9344ae8ef7 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ae5c954b68e3654eb2a64b8a9cbf3960e61cdbc9 (diff) | |
| parent | 7b880ae4922491750383ebc2631e7c5f85e5c2d2 (diff) | |
am 79090cb3: merge from open-source master
Merge commit '79090cb3da132d07cd3888ef9242df9872fb4aa1' into kraken
* commit '79090cb3da132d07cd3888ef9242df9872fb4aa1':
Change license for the UUS Information file.
Remove ProximityAlerts Receiver when last ProximityAlert expires.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions