diff options
| author | Greg Plesur <plesur@google.com> | 2017-02-09 00:03:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-09 00:03:12 +0000 |
| commit | 2d2d671229b956c40e61755e9227dfce0f383e28 (patch) | |
| tree | d9c135473c5c5a0e0259d7820995a3f8f4e5a446 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | edfc9370d9277b09e085673bfa4831288691ffa0 (diff) | |
| parent | c296020f55fa18b5cdaffef368e01711642c78d3 (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
am: c296020f55
Change-Id: I98f4fac8b063ebec21271e5b46ff3027305c1165
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions