diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-02-11 07:40:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 07:40:08 +0000 |
| commit | 492def919811bfcd7149651c6ea8ee0a2434bf79 (patch) | |
| tree | 63c59bab3bbb5ce6f60285c2c7004ecd6c8482f8 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | cd25e1c6df8d38d908fe261120f3a38edb2a4aa4 (diff) | |
| parent | 2d33b31c86ade166b97cbb9085e0185f765932cb (diff) | |
am 2d33b31c: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b automerge: 00c8450
* commit '2d33b31c86ade166b97cbb9085e0185f765932cb':
Make getNetworkInfo() take into account VPN underlying networks.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions