commit | 82df3a03fd954fd9b1cca1fb7dc2a0ed415b791b | [log] [tgz] |
---|---|---|
author | Alex Klyubin <klyubin@google.com> | Tue Jun 09 16:43:54 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 09 16:43:54 2015 +0000 |
tree | 5786f3eaf156761d27779e4c4f5bbe6e1e4e4a7d | |
parent | 368a731af296f067f014cae80887f7077aca66a3 [diff] | |
parent | c1c71e3933e9d082f2310737f1e3c8504f49536b [diff] |
am c1c71e39: am 6c34480e: Merge "KeyChain does not use cleartext network traffic." into mnc-dev * commit 'c1c71e3933e9d082f2310737f1e3c8504f49536b': KeyChain does not use cleartext network traffic.