diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-03-22 19:07:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-03-22 19:07:18 +0000 |
| commit | 8eba19368e0bb77f6d35c42ca1cac0ad9cb5ebc9 (patch) | |
| tree | 22c06c33b1538b3d1224676678753311cc832281 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | fcf394ce181734a5e3459da5f0c07a7972a5de73 (diff) | |
| parent | 70c19fac8e737a8855164134e0ac97bf762d86bc (diff) | |
Merge changes from topic "am-4b90382f938f437a92b13e188f18d8ed"
* changes:
[automerger skipped] Revert "Revert "Update VPN capabilities when its underlying network set is null."" am: 9f98789d3f -s ours am: a8056e3fb8 -s ours am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 4fa80e8a2f is in history
[automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkStatsService." into pi-dev am: a24113f030 -s ours am: c14d2102db -s ours am skip reason: change_id I57e117bb4e9efe491b19d6b5a479f2d58d1c58e6 with SHA1 02c50ef1d1 is in history
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions