diff options
| author | Julius D'souza <jdsouza@google.com> | 2017-05-30 13:09:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-30 13:09:33 +0000 |
| commit | 7df6625d08750fe73ca3f64b5c2e5a2d8c6d11dd (patch) | |
| tree | 2620930e836d25f37f8c2e17a9f3b2c60a53822a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 67f04265338930734d1481f4160e61f840633df0 (diff) | |
| parent | d9251bad5b251a3247ec03a71a15aecdcfb2c1a3 (diff) | |
Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev am: f4abac4d8f -s ours
am: d9251bad5b -s ours
Change-Id: Ia059d6a9eb146abedd2f05953c79362b457eab97
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions