diff options
author | Chiachang Wang <chiachangwang@google.com> | 2020-02-18 06:34:48 +0000 |
---|---|---|
committer | Chiachang Wang <chiachangwang@google.com> | 2020-02-18 06:34:48 +0000 |
commit | eb79b4b002b336569e42f7510093ade197b98b02 (patch) | |
tree | a6b28ce7fa0be86730f219e2283dfe41d729c223 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | da0c5df4af50a670c8a1928b46d5e4d1e9a63f2f (diff) | |
parent | 6d20c0e20dea7c1149545963beb7bc1b78308924 (diff) |
[automerger skipped] Merge "Add NETWORK_SETTINGS to SystemApi" am: 0ab508981a am: c4f123463a am: 6d20c0e20d -s ours
am skip reason: skipped by user ngeoffray
Change-Id: I8d874eba5aa1303ee01b369d9704de6c12329889
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions