commit | c48516618231e09875cc95efb25259a14b0e3827 | [log] [tgz] |
---|---|---|
author | Santos Cordon <santoscordon@google.com> | Wed Aug 06 20:38:13 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 06 20:38:13 2014 +0000 |
tree | 5e4e9adb07b8555d5a0f37f9d78fc19eca0c54bf | |
parent | cce4f6a5e0160d9bbb76ae4f9f453dd5861f27b3 [diff] | |
parent | 916052eb37635b123f84294aa3c7f3bc9c4040b1 [diff] |
am 552a1d51: Merge "Remove ldaps from AOSP code." into lmp-dev * commit '552a1d512031eb33ead3927e867c77a723d431dd': Remove ldaps from AOSP code.