diff options
| author | Jonathan Scott <scottjonathan@google.com> | 2019-05-08 20:40:48 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-08 20:40:48 -0700 |
| commit | b3878dc1f8c435963393347b2a3eea9d07e4df01 (patch) | |
| tree | 7ec76cc865e787b2b25f8337fa0bb23efd94bc54 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 44d474d7c7db493ab227dc1640936160c8f5b027 (diff) | |
| parent | 77d21995fc39c5fa1e5c59faf5c345f362989382 (diff) | |
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518 am: 498d367b2c am: d6f4a3f2bc skipped: ad38008f58 am: 970863ea62 am: 9707affaa8 am: 906080bd27 -s ours
am: 77d21995fc -s ours
am skip reason: subject contains skip directive
Change-Id: Iff8981642c8278a14827f946fc19efd8d6507e25
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions