| commit | 735e8230adb31239952c640a1a0e372af86e88cd | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Feb 08 23:53:15 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Feb 08 23:53:19 2017 +0000 |
| tree | 294fe3ab4d89251c6d0bc5e21312ffc88348fd0f | |
| parent | 7658c60e91f9348040deb0e78e76e3ddc2e2da67 [diff] | |
| parent | 5d9343b60a3f3f29af95cb155f7605a354f6fbd1 [diff] |
Merge "Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am: 8a2ea2cf83 am: 58fce5386b" into nyc-mr2-dev-plus-aosp