commit | b0daf7a36f3f4c28b655e51c2a15808fb683fd97 | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Fri Sep 23 20:56:39 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Sep 23 20:56:39 2016 +0000 |
tree | 076783ee2fedba64bde1590e97985b86f90e82a4 | |
parent | 372ff3753930b9c0a3f619f9d5006b9e90c6c121 [diff] | |
parent | 317f72e0171900ac38533d22544ecedab70ecdf3 [diff] |
Merge "Move android_get_control_socket out of line" am: 4b5abcdba2 Change-Id: If427dfca41a23d94f2f026edbeb0dc8cd73a4724