diff options
author | Pankaj Kanwar <pkanwar@google.com> | 2016-10-24 02:20:20 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-10-24 02:20:20 +0000 |
commit | 7332192158986c652c78e477c9a8cf0194f9060d (patch) | |
tree | d65a1fc174ab38a91333d0834c40a34fc15ddca0 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | b9dc4cf958f8c0f0104f08a1d8fd66755b154257 (diff) | |
parent | 0d75ccf0068b64c730c45bf0a53d1849f9fbe010 (diff) |
Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev am: 9cac4568e5
am: 0d75ccf006
Change-Id: I7c147cf575e1040a82a7fe05a97a45e06108b010
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions