diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-02-11 07:32:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-11 07:32:53 +0000 |
| commit | 2d33b31c86ade166b97cbb9085e0185f765932cb (patch) | |
| tree | 02455cddd5e58c2e85a2c78f1d50bd2c12a8cdb6 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | ac46e8240470eefbfebb852906a1972ee5faf4db (diff) | |
| parent | 00c8450d2711de57ee45f66cae1050dbca98d1f5 (diff) | |
Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b
automerge: 00c8450
* commit '00c8450d2711de57ee45f66cae1050dbca98d1f5':
Make getNetworkInfo() take into account VPN underlying networks.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions