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