diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-01-28 02:16:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-28 02:16:40 +0000 |
| commit | 59b3558dacf668d85ed1a0e54d43eee1ae20eb09 (patch) | |
| tree | cd67dc07b2b49c3143188819b5a3d5c705978111 /tools/aapt2/diff/Diff.cpp | |
| parent | b41e016fb97247b8e7543d8b5151f82c68644656 (diff) | |
| parent | 36828f5406f86b2a9aa8489f256a0f15bd406eeb (diff) | |
Merge changes from topic 'am-febb6164619c46f681eb6dc8a6c58e06'
* changes:
Test passing null cert/keys to WifiEnterpriseConfig am: 88b3c589ad am: cb79016b16 am: 3bac61ac86 am: 96c87f7a9b
Account for null client certificate am: 1ca57a1d10 am: 4ad314b463 am: 25eff7731a am: b35b219516
Add a client chain to WifiEnterpriseConfig am: 291ddaef78 am: cd463ff269 am: 80b5793645 am: 9c9d4f6f6d -s ours
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions