diff options
| author | 2017-02-08 23:54:08 +0000 | |
|---|---|---|
| committer | 2017-02-08 23:54:12 +0000 | |
| commit | c296020f55fa18b5cdaffef368e01711642c78d3 (patch) | |
| tree | 294fe3ab4d89251c6d0bc5e21312ffc88348fd0f /libs/androidfw/Asset.cpp | |
| parent | 735e8230adb31239952c640a1a0e372af86e88cd (diff) | |
| parent | 50447143c2c8bc3dd8ca3a40c2936ebeb647b1e7 (diff) | |
Merge "Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am: 8a2ea2cf83 am: ddec36e31a" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'libs/androidfw/Asset.cpp')
0 files changed, 0 insertions, 0 deletions