summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2017-12-18 21:57:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-12-18 21:57:05 +0000
commit11448df5a1f4f1cc7af766812c6eb815e579e782 (patch)
tree29e49cabe26e9b29cc172ab1d97a716d62e91abb /tools/aapt2/java/JavaClassGenerator.cpp
parent6f2f0f639b1745684b88147f5d01a152764ab57f (diff)
parent570970f6b2a72e10dcfbb27ad706c41074af3aba (diff)
Merge "Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID." am: bef8c59634 am: 826657a9c2" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions