summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorChristophe Koessler <ckoessler@google.com>2019-05-31 13:19:35 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-31 13:19:35 -0700
commitac3256a48580160ed9ec71e6d4ad8c8664a8dbdd (patch)
treefa1592c566b62bdf981bf86bb77acfedaf3ec6da /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf1af201b254a608839753c2011cf2e58b38c8e1e (diff)
parent40cff7025a74ef9bb1e513efd4938d157a1dedca (diff)
Merge "DO NOT MERGE: Disable resume for guest session if user is ephemeral" into qt-dev
am: 40cff7025a Change-Id: I2af1941357deb00c2c5f43163954d59cb3625b23
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions