| commit | b26f73464c09317e0d0b229aaa02eb75519f8e0c | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Sep 23 21:00:41 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 23 21:00:41 2016 +0000 |
| tree | 9b91475798305094522560d31955ec3af8de42b9 | |
| parent | ce196d911bbc1a09ea7832bc3203d2337981063f [diff] | |
| parent | a736f19bf51964db6f79c19c6a0da4ecedbef793 [diff] |
Merge "Move android_get_control_socket out of line" am: 4b5abcdba2 am: 4873829953 am: ea2b61c7a8 Change-Id: Ib406546b998d6d525829f0023a5f693c2e1dfd6c