diff options
author | fionaxu <fionaxu@google.com> | 2017-09-06 04:19:45 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-06 04:19:45 +0000 |
commit | 1af24abbb94fb1298c61878e2770aefab7afa010 (patch) | |
tree | 3adc1b4447ce81f7d0d587fcafef31e95d39660a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 162790c257f1f84d117b73bbccec7ebac19f60da (diff) | |
parent | bd1a71613547e894b37ddd2582a31062c7278cc9 (diff) |
Merge "disable carrier actions on redirection by default" into oc-mr1-dev am: 5bed401148
am: bd1a716135
Change-Id: I6e0ef66e1cd96683b37f8eff0a8f6fbd4d2901f7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions