commit | ea2b61c7a8029f016d006816a424c6a670fb9a6d | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Fri Sep 23 20:58:40 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Sep 23 20:58:40 2016 +0000 |
tree | df6ead4a760b638e90df91fc7a8f04f2e18bcade | |
parent | 9fef9255424b8edeb013b035caaa50f9ed998f2e [diff] | |
parent | 4873829953aec9d2a9eda17059f2908713b06c04 [diff] |
Merge "Move android_get_control_socket out of line" am: 4b5abcdba2 am: 4873829953 Change-Id: I45e8b86e43a47213664acf486a5de266bab6deb8