summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Lorenzo Colitti <lorenzo@google.com> 2015-02-11 07:24:50 +0000
committer android-build-merger <android-build-merger@google.com> 2015-02-11 07:24:50 +0000
commit00c8450d2711de57ee45f66cae1050dbca98d1f5 (patch)
tree021042802d3decda76c5ae27af08fa6b088b8701 /opengl/java
parent6b274720c5a210c07256e5b9fc11a1e9aca59017 (diff)
parentc38b90bb6bc5efc5f07e69b86d10f76a1eaa9eb4 (diff)
Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev
automerge: c38b90b * commit 'c38b90bb6bc5efc5f07e69b86d10f76a1eaa9eb4': Make getNetworkInfo() take into account VPN underlying networks.
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions