diff options
| author | Greg Plesur <plesur@google.com> | 2016-11-04 14:09:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-04 14:09:33 +0000 |
| commit | d4ef6421e553ec81e41639af5c4a109412be98e0 (patch) | |
| tree | b08dea944305d2e65bc8eab8cdfa2b5b0823661d /tools/aapt2/diff/Diff.cpp | |
| parent | 9ee91d8d11416e102c12859ffbe1d35fc9eedc55 (diff) | |
| parent | e50a485c22334fd5b63663200a8e39f7e2b5b108 (diff) | |
Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev
am: e50a485c22
Change-Id: If0ae1447b1931c498134f16ecf4bd51efa83b9e0
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions