diff options
| author | Greg Plesur <plesur@google.com> | 2017-02-09 00:01:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-09 00:01:44 +0000 |
| commit | f1929eee6270df4551adb4b1061ebdda86522c53 (patch) | |
| tree | d9c135473c5c5a0e0259d7820995a3f8f4e5a446 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | bfce5bcfc8fb1438dedc850606f65e014a303ab2 (diff) | |
| parent | 735e8230adb31239952c640a1a0e372af86e88cd (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
am: 735e8230ad
Change-Id: I96ba158ea11611e5d4d82d4ad36af0676b64592a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions