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