diff options
| author | Greg Plesur <plesur@google.com> | 2017-02-08 23:53:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-08 23:53:29 +0000 |
| commit | 50447143c2c8bc3dd8ca3a40c2936ebeb647b1e7 (patch) | |
| tree | 294fe3ab4d89251c6d0bc5e21312ffc88348fd0f /tools/aapt2/diff/Diff.cpp | |
| parent | 7658c60e91f9348040deb0e78e76e3ddc2e2da67 (diff) | |
| parent | ddec36e31ab780f33b8470418e97ae2d1302b121 (diff) | |
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am: 8a2ea2cf83
am: ddec36e31a
Change-Id: Id36db178cad26adba0a43370af2f4f6cdd1a0443
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions