summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorJulius D'souza <jdsouza@google.com>2017-04-12 02:01:28 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-12 02:01:28 +0000
commit6717748effb545ad89b361f16336649603d648ab (patch)
treebe481ded7ad40592ba2b15ca1b90b6d6712219d3 /tools/aapt2/java/JavaClassGenerator.cpp
parent540bc2d94ea35842056a4558919d1202f3ea85a2 (diff)
parent3c6d6f53f3d1dc80740c1df94b9a1566f84f8f14 (diff)
Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96
am: 3c6d6f53f3 Change-Id: I4a3785a799a523c1e650929cf70f333a2492377e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions