summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorBruno Martins <bgcngm@gmail.com>2019-09-24 15:34:21 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-24 15:34:21 -0700
commitd1b085d6c5df7375ae2c966972013afae22b17b9 (patch)
tree696e8acc02ec213e117758d168d44668051cac81 /tools/aapt2/java/JavaClassGenerator.cpp
parent7f9a4c9e8cc8d32a6128c9c55d576793a2f0ecf8 (diff)
parent355e5f95e58f69d55d748a58cfadd72479224cec (diff)
[automerger skipped] Merge "AppOpsService: Watch op mode changes when an AppOp restriction dies" am: a96bafd7a2 am: 061fda060c am: 7f79ed1459
am: 355e5f95e5 -s ours am skip reason: change_id Ied66c7f49e1c483870048563d08fb57410f004ef with SHA1 b420a64ebf is in history Change-Id: I37d8f727188b9a11629726a8842c48577d4d258f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions