diff options
| author | Adrian Roos <roosa@google.com> | 2019-08-15 15:14:52 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-15 15:14:52 -0700 |
| commit | 9326361647835ebaac10b74bda9869e66087fedd (patch) | |
| tree | 66d41dbb4c08b5069686cf2e47086a472f2cf6f3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f43ba0c1ea5643f7972c2a6ee2c96c58e6f090c7 (diff) | |
| parent | ac2b848cf0019f64825148e711027aaa1b5e035b (diff) | |
Merge "[automerger skipped] Merge "API: Explicitly track incompatibilities with previous API versions" into qt-dev am: d3b53e080d am: 1ac726e718 -s ours am: 2a2a283a17 -s ours
am: ac2b848cf0 -s ours
am skip reason: change_id I1f17b57705e2f7350b55ab278e06fc4e988771ff with SHA1 369246b4cc is in history
Change-Id: I78e90e9f9d2f817d76228a601092f04b4fd74ec6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions