summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2019-08-15 14:47:36 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-08-15 14:47:36 -0700
commitac2b848cf0019f64825148e711027aaa1b5e035b (patch)
treeecb55177df389c26f90afa3cc78b023301cd4011 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7c2e2568794e6020fd784bb0a369319d3251f433 (diff)
parent2a2a283a17f70d70daf0ea73cc3fd58de988d8d7 (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 skip reason: change_id I1f17b57705e2f7350b55ab278e06fc4e988771ff with SHA1 369246b4cc is in history Change-Id: I9fe65fcffeb55471ec7f00621de7e472d77fac78
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions