summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2019-11-25 14:18:23 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-25 14:18:23 -0800
commit8543cb56c2d97ede9f2d9d7d6ad8e3b871102351 (patch)
treeba4feb6081415623f238d0ee43a0e2a0b04a699b /tools/aapt2/java/JavaClassGenerator_test.cpp
parent5a00ad3a75a74a74e1e9aadbd334f39ee31b9baa (diff)
parent122674a0b508bb956739f2c7fd61b9db162dc5d5 (diff)
[automerger skipped] Merge "Fix for Surface#lockHardwareCanvas lockups" into qt-qpr1-dev am: d90c8a0f5e
am: 122674a0b5 -s ours am skip reason: change_id Iffbd9f9e6689a40876ff3aa74c10020e3f09fc6a with SHA1 cd18c2271d is in history Change-Id: I223c27bdcb652522b36f0d4dc55657514bfe627d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions