diff options
| author | Zoey Chen <zoeychen@google.com> | 2019-12-05 00:46:17 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-05 00:46:17 -0800 |
| commit | fb3fdce2c2b7c2fdb119be707cd89be93deae38d (patch) | |
| tree | 6290eb55dd772936061428527f719c6feac9c6e3 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 532a710d88672b6ab0876f6f06c5ce18e5859092 (diff) | |
| parent | aeab4bda93c0471461b066f16e42e736e797cc20 (diff) | |
[automerger skipped] Merge "[Telephony mainline] Add SystemApi and NonNull annotation" am: 8e708ff380 am: ae95a26703
am: aeab4bda93 -s ours
am skip reason: change_id I619d6ba04cb28830e3995feb02ffcb592ff65818 with SHA1 fa86d5a012 is in history
Change-Id: I335fc017f6d18d039f2c51ce691f614015fd6c72
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions