diff options
| author | Chen Xu <fionaxu@google.com> | 2019-11-05 10:52:02 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-05 10:52:02 -0800 |
| commit | d135928561947b13eebb088ff6ba91667bd488cb (patch) | |
| tree | a925ca9028129b094e2bcfd814325adf9fe1c171 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ddea4daf1d8376a181c139fa9aa5c87880e622ae (diff) | |
| parent | 3157fcdfd894cd58f1713557fef09a760e9b4bb8 (diff) | |
[automerger skipped] Merge "new telephony annotation class" am: 386027afdd am: 54aba99636
am: 3157fcdfd8 -s ours
am skip reason: change_id I37f8a0624bbf27f264870ee9dbf03d3aaa5cadc1 with SHA1 c9d4ee112e is in history
Change-Id: I103636898f05ba53a6249bf45e3806c82fab24e9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions