summaryrefslogtreecommitdiff
path: root/libcutils/socket_local_server_unix.cpp
diff options
context:
space:
mode:
authorSergio Giro <sgiro@google.com>2016-07-14 18:24:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-14 18:24:17 +0000
commitae21a253831a6e330ce7c8684321017946d7a6b2 (patch)
treef8ac5f336ba4a8c575d29915f7c087eb624556be /libcutils/socket_local_server_unix.cpp
parent207717bde6edabe16f50115b4fc07d6a184ccdf8 (diff)
parent72bad95df5dc6603b0f99c4a089bc2f6684eda6d (diff)
Merge \\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\" into lmp-dev am: 8d2d6cedbb -s ours am: 71da8e7537 am: 5e03ed1dab am: b00e3603ef -s ours
am: 72bad95df5 Change-Id: I157121792e7de52ae705afc105ebf31299612b59
Diffstat (limited to 'libcutils/socket_local_server_unix.cpp')
0 files changed, 0 insertions, 0 deletions