tree dc35b56a94b3156fdfb6ac9ca270210dca4f2baf
parent 5005c1be3a1250a971663bd46b702e1afc8a4d54
parent 8de5ac7bae0109186434a6a0fd5321705b045189
author Amit Mahajan <amitmahajan@google.com> 1490678040 +0000
committer android-build-merger <android-build-merger@google.com> 1490678040 +0000

Merge "Remove SAP socket." am: 3ca9bd02b8
am: 8de5ac7bae

Change-Id: I574d84aeba4c22fd58a84704da2f55c5307cf5e4