diff options
| author | Julius D'souza <jdsouza@google.com> | 2017-04-12 02:21:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-12 02:21:15 +0000 |
| commit | e7fd499a3323b822bfa87bbc9e7d70cf94d2f9ae (patch) | |
| tree | 29e629dd01a2f724a80be91051b295517897941a /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | c735ac04d36861691ae8c879ecafb1ba243b2a4b (diff) | |
| parent | 3e00a43eb085b136411b5a37d66e4818bd8c2ac2 (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 -s ours am: ed799ef6fb
am: 3e00a43eb0
Change-Id: I274fafafda952f5426cb7119d1752710f64861ce
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions