diff options
| author | The Android Automerger <android-build-merger@google.com> | 2016-12-03 04:05:51 +0000 |
|---|---|---|
| committer | The Android Automerger <android-build-merger@google.com> | 2016-12-03 04:05:51 +0000 |
| commit | 9f9a239ca3a18a2975997ae16260b29820a1d967 (patch) | |
| tree | 5b8e0fe33bf45b4581de41730a61b0405f1caea4 /libcutils/socket_local_server_unix.cpp | |
| parent | 18f2b9f4c0b5bd5beef78d146450653902c509d3 (diff) | |
| parent | 61e74d7a1bad00603173507ecdc171c89eb15204 (diff) | |
Manually merge commit '61e74d7' into stage-aosp-master
* commit '61e74d7':
libsparse: add a function to retrieve the data blocks
BUG:33304034wq
Diffstat (limited to 'libcutils/socket_local_server_unix.cpp')
0 files changed, 0 insertions, 0 deletions