diff options
| author | Greg Plesur <plesur@google.com> | 2017-02-08 23:52:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-08 23:52:32 +0000 |
| commit | 5d9343b60a3f3f29af95cb155f7605a354f6fbd1 (patch) | |
| tree | 294fe3ab4d89251c6d0bc5e21312ffc88348fd0f /tools/aapt2/diff/Diff.cpp | |
| parent | f206de957a15420d25eefdca656ee9a0528dd93f (diff) | |
| parent | 58fce5386b0740fcfb6104a54079fe60caa70ad8 (diff) | |
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am: 8a2ea2cf83
am: 58fce5386b
Change-Id: I784fc51c541da12056f7c47810d3b222f40dea04
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions