diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-02-09 19:58:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-02-09 19:58:23 +0000 |
| commit | 1f26fadba73bf428d7a6662810f2a87ce3d6da45 (patch) | |
| tree | 4eb70d29bd478f9e2273acded3f7ba66c2c9703a /tools/aapt2/diff/Diff.cpp | |
| parent | a55677651f78801a7b608ee8f7886104f453801d (diff) | |
| parent | d5c031c75bbdd0ed75d6acde88919e9262ff086a (diff) | |
Merge "Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am: 5659b15a94 am: 0265687aef" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions