tree beb4e811093e852490413927603a0aa7eeb970fc
parent 6059c9310c85986f38c22940470e5a0ff280806f
parent da120f4e3d32ca97c5b4c21d6c505d834a29ab8d
author Santos Cordon <santoscordon@google.com> 1407354531 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1407345295 +0000

Merge "Remove ldaps from AOSP code." into lmp-dev