summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Hui Lu <huilu@google.com> 2014-02-25 18:00:05 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-02-25 18:00:05 +0000
commitfcf7d3a64947a8a0f05ee9e0669abe4a0727f926 (patch)
tree1e594f577a641464d591881247cb0848620c3c46 /opengl/java
parentf2d07694d05240b039bd02cf3982941c0435c33d (diff)
parenteeb291b7f36d63c3db467cc7f4be61af09aa3171 (diff)
am eeb291b7: am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev
* commit 'eeb291b7f36d63c3db467cc7f4be61af09aa3171': Reconnect/teardown proxy network connectivity.
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions