diff options
| author | Julius D'souza <jdsouza@google.com> | 2017-04-12 02:24:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-12 02:24:40 +0000 |
| commit | e67e60fad496fd0f0c4e11101679ea25f4020258 (patch) | |
| tree | 29e629dd01a2f724a80be91051b295517897941a /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | e7fd499a3323b822bfa87bbc9e7d70cf94d2f9ae (diff) | |
| parent | 94317730392fa32ca2deb1554a08689978a87974 (diff) | |
Merge "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" into oc-dev-plus-aosp
am: 9431773039
Change-Id: I6f01161b7d11a65585c8da025932c84d32663c92
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions