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