summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Sharvil Nanavati <sharvil@google.com> 2016-03-21 14:19:37 -0700
committer Sharvil Nanavati <sharvil@google.com> 2016-03-24 00:23:38 +0000
commitcd8bb276f2e1975b71a9bef8c4f89d918fd5e296 (patch)
tree9dc99d6da9f7ec51ba86bda5929392c5f2a61efc /libs/androidfw/AssetManager.cpp
parent54c3808802e643785cc76b29067d1119e9c78af4 (diff)
DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY.
Change-Id: I48c0a7bc39e2efcc5b4120a4fa2ecf6dfd54ac27
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions