tree 07511e62e9504da8139dd4558ace3ae449557601
parent 17389bd3c1f15b4264c604fe72819d8b22bc7c5c
parent 14a4a6123fa837cfb0a9cb1e76122f70184b3110
author Kenny Root <kroot@google.com> 1474439656 +0000
committer android-build-merger <android-build-merger@google.com> 1474439656 +0000

Merge "Try to set endpoint identification algorithm if available"
am: 14a4a6123f

Change-Id: I5514b380c1dbfe897011817985e942a1a8e3abb4