diff options
| author | Julius D'souza <jdsouza@google.com> | 2017-05-26 22:05:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-26 22:05:44 +0000 |
| commit | d9251bad5b251a3247ec03a71a15aecdcfb2c1a3 (patch) | |
| tree | a5a37a559875999f1c7a1740e6fe33e112f0d44d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | eac7a439d03e23cd736282c4155046d9ad777bdb (diff) | |
| parent | f4abac4d8f8ea9041b0106161bfda20f844aade6 (diff) | |
Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev
am: f4abac4d8f -s ours
Change-Id: I71478993576ea4d7fb58ceec7eb5a7bc63b425a0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions