diff options
| author | Greg Plesur <plesur@google.com> | 2016-11-04 14:02:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-11-04 14:02:12 +0000 |
| commit | e50a485c22334fd5b63663200a8e39f7e2b5b108 (patch) | |
| tree | d686adb6008172dbbeae557eec84386917e5cd16 /tools/aapt2/diff/Diff.cpp | |
| parent | 343dbac2e0519f0dda41eb9337957b35f53098a9 (diff) | |
| parent | 34fb70ab88408b629350a80f6f68648a95db62bf (diff) | |
Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions