diff options
author | Daniel Nishi <dhnishi@google.com> | 2017-07-06 22:05:43 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-06 22:05:43 +0000 |
commit | 9d22950fc828868983b455439bb2afbdf95def58 (patch) | |
tree | 71dfec0b8c6d33c5101185fc23a624548c44e706 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 0a97a0e72d3f5f84e6ca9e2ca4d6c3ec7857cae2 (diff) | |
parent | a48cf1e61927c0beed805a4ceee66712005c4e24 (diff) |
Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev
am: a48cf1e619
Change-Id: I0382e247050e075f80ea94ae39509cea1e133b98
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions