diff options
| author | Greg Plesur <plesur@google.com> | 2017-02-09 00:01:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-09 00:01:39 +0000 |
| commit | bfce5bcfc8fb1438dedc850606f65e014a303ab2 (patch) | |
| tree | d9c135473c5c5a0e0259d7820995a3f8f4e5a446 /tools/aapt2/diff/Diff.cpp | |
| parent | 30110eaeec86cea403cf94f2e75ff4396a0f93c2 (diff) | |
| parent | 5d9343b60a3f3f29af95cb155f7605a354f6fbd1 (diff) | |
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am: 8a2ea2cf83 am: 58fce5386b
am: 5d9343b60a
Change-Id: I2d163d2a3eb1edfd0329992ae5c98c9b11cd9ad5
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions