diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-12-02 16:54:04 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-02 16:54:04 -0800 |
| commit | 00f1ac8001b2bfe2ab70730d9c039ca4e633a2c2 (patch) | |
| tree | 244ec0a4c6c84622f859a95634c1ab3d779cfe6e /opengl/java/android/opengl/Texture.java | |
| parent | 0c7e894e79bea35f979d30e4e3bb6115b102cafd (diff) | |
| parent | 2a7b5ab16af697f386ad7ae346e1bf9229086fa8 (diff) | |
am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1
* commit '2a7b5ab16af697f386ad7ae346e1bf9229086fa8':
Be careful sharing connections when dun is in play
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions