commit | a736f19bf51964db6f79c19c6a0da4ecedbef793 | [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 | c16f6a268f7eab34e0fb6c8d1b482fba329abb44 [diff] | |
parent | b0daf7a36f3f4c28b655e51c2a15808fb683fd97 [diff] |
Merge "Move android_get_control_socket out of line" am: 4b5abcdba2 am: 4873829953 Change-Id: I45e8b86e43a47213664acf486a5de266bab6deb8