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 | 1f35de2a2e9a5607cc3bc57fbd33c65392c82cfd (patch) | |
| tree | ca1b5e4ef280c0049075236ed46b91a3db7c24ce /opengl/java/android/opengl/Texture.java | |
| parent | d6e24ca28b0b6384fd9b3117713402a1f43fdef8 (diff) | |
| parent | 79090cb3da132d07cd3888ef9242df9872fb4aa1 (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/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions