diff options
| author | Aaron Huang <huangaaron@google.com> | 2020-04-17 11:17:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-17 11:17:28 +0000 |
| commit | 17e82c57889dc431afdc77b70edfe13e711e8a6d (patch) | |
| tree | d7c9e0a80d656d56dd449d3f322383bc283022a9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 00de1c5ed497d69794167ccdd02fcb1a136754e9 (diff) | |
| parent | 32a2a99cb81baa23c5376ea3ad9f8e4457812445 (diff) | |
Merge "This contains a squash of two changes >>>>>>>>>>>>>>>>>>>>>> aosp/1284588 Adjust permission of NetworkProvider related API" into rvc-dev am: 96f705dbeb am: 32a2a99cb8
Change-Id: I2df1621d36d1e144e6f25200755c4cedb2838f34
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions