diff options
| author | Greg Plesur <plesur@google.com> | 2017-02-09 20:10:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-09 20:10:04 +0000 |
| commit | 0e39f18e260c81364e9d89a63c8f2c13c28b93d9 (patch) | |
| tree | 718c5ebd7b65bfa850957a24a730bec48d6df9cb /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | d8ede890bbca976e82031fc85479edaef6a6b805 (diff) | |
| parent | 1f26fadba73bf428d7a6662810f2a87ce3d6da45 (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
am: 1f26fadba7
Change-Id: Ia2ff41983c4b04f11e22c95fd4659bdd0521a1f6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions