summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorJack Yu <jackyu@google.com>2019-11-14 13:11:43 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-14 13:11:43 -0800
commitf274d2b9a4309a3b15e7525a9ced1b22d940ae59 (patch)
tree50b56cb8af0a9461435716fd695657e8bd708bbf /tools/aapt2/java/JavaClassGenerator.cpp
parentb94024b9a96c161c4f3b7dd4283f5093e76dab97 (diff)
parent54030492251ce4100ae8a4f7f6d1acb678c27824 (diff)
[automerger skipped] Merge "DO NOT MERGE - Added reset geo-fencing checking after airplane mode support" into qt-qpr1-dev
am: 5403049225 -s ours am skip reason: change_id Ifa3de1576f23f68b040c8473bc79b4bf5a5f7261 with SHA1 6711cc80ce is in history Change-Id: I79e54d03e944eced9dde3d1933372da1306c6b23
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions