diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-08-11 02:30:31 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-11 02:30:32 +0000 |
commit | f6487b63a1ae674559d50456473e9d439871ec46 (patch) | |
tree | e12f773a49acdaace58741856016f60e27621385 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 927db408a2857b209b1a313ac9208a7892956836 (diff) | |
parent | 9d6fc9246ba0b726872a6a8dabe6c334292c3a10 (diff) |
Merge "Only disable trust agents after lockout" into nyc-mr1-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions