diff options
| author | Julius D'souza <jdsouza@google.com> | 2017-04-12 02:11:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-12 02:11:26 +0000 |
| commit | 4508ed51d463b4a1a276d67d76f8d39afda9f557 (patch) | |
| tree | 0dcc331a2341262c7f6aeeceae0d4e68bb4ff2b7 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | cc6836cf643b18896bb1cf76d8391b5965b7aa2c (diff) | |
| parent | 6717748effb545ad89b361f16336649603d648ab (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
am: 6717748eff -s ours
Change-Id: I8ef6575486308872b5eaea54777b497dc3a00616
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions