diff options
author | Jack Yu <jackyu@google.com> | 2021-04-02 20:10:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-02 20:10:28 +0000 |
commit | a2193d08c4740b0f79b3fd1785141f9cdcf81202 (patch) | |
tree | f8c71a1ab76836590d81cdd4a6d0f6ce62fd0483 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 117e1cbfaf85bd704b290c4b5cf9db53b713fa65 (diff) | |
parent | 31cfa799e6effa961e6064abeb5c0067c1412531 (diff) |
[automerger skipped] Merge "Added the missing constant to intdef" am: 9df3f37868 am: 501a9357c1 am: 31cfa799e6 -s ours
am skip reason: skip tag Change-Id I705b56e158dd66cb8084b1efa5f1e7f2195295a2 with SHA-1 79593b16c8 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663519
Change-Id: I16e1e4b6da82f05ea382019123a8b51ac456760d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions