diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2018-01-23 00:28:39 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-23 00:28:39 +0000 |
commit | 9c93808e5ecdd040605e0472d2838a369b1d3e9f (patch) | |
tree | 8047c5f5b26777fca7299222a6ffa574a44472b7 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 42c76f9cf8d13d5c540a441ab70d6c3af566f4f9 (diff) | |
parent | 53ba2f0c12e816a08b0fb737ef651a340a5ed0a4 (diff) |
Merge changes I4d985a27,Ic6f2bc18
* changes:
Add metered, roaming, and defaultNetwork info to NetworkTemplate.
Unbreak frameworks-net tests broken by missing libutilscallstack.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions