summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndrii Kulian <akulian@google.com>2017-10-16 20:16:34 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-16 20:16:34 +0000
commit78a9d153685871ff5ba36e00202c601d34ee1094 (patch)
tree8a55c5a3221bb9a128c84ba697270078eb550a0d /tools/aapt2/java/JavaClassGenerator.cpp
parent2184fb285dac9c3666fce1da97f6e3de401962a2 (diff)
parent4f4d64659abc0db7c3f9dc5a9ae3f14e61c6776b (diff)
Merge "DO NOT MERGE: Don't let keyguard to influence orientation when dismissing" into oc-mr1-dev am: 96da027196
am: 4f4d64659a -s ours Change-Id: Ifc982b4ab344d377494a761fab05cd418261fc33
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions