diff options
| author | Steven Moreland <smoreland@google.com> | 2017-04-14 11:23:36 -0700 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2017-04-19 10:39:54 -0700 |
| commit | e131f31db51100dfa27d201d86f3f2d92a89d0fc (patch) | |
| tree | 1aa01cb74233c7674737d9329aa8cf211c6456ce /libcutils/socket_local_server_unix.cpp | |
| parent | 9990de1f643c9dc581e2977ae7222a21c39389b0 (diff) | |
libbase: fix build breakage
Two changes were merged at the same time that conflicted.
Test: builds
(cherry picked from commit 72b9d28423fb79eebdd4d74593ca03e1cbc7d75f)
Merged-In: Ia6c730804cd5a3b2655e6d69b8e4f346d198dabb
Change-Id: Ia6c730804cd5a3b2655e6d69b8e4f346d198dabb
Diffstat (limited to 'libcutils/socket_local_server_unix.cpp')
0 files changed, 0 insertions, 0 deletions