summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Greg Plesur <plesur@google.com> 2017-02-08 23:44:17 +0000
committer android-build-merger <android-build-merger@google.com> 2017-02-08 23:44:17 +0000
commitddec36e31ab780f33b8470418e97ae2d1302b121 (patch)
tree0a8a4e9b073a7dba00a5e64cc2f845e39e57bd1c /libs/androidfw/AssetManager2.cpp
parent66af3515dee796d8303c313ca999ee957675c310 (diff)
parent8a2ea2cf83c3f5a0269918731b1a7ad4a4e475b9 (diff)
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev
am: 8a2ea2cf83 Change-Id: I9c2c3d822023277aada4685a11f4b272585550ea
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions