commit | 137d23d36e7e354211b14108bee7fa94a3277ad5 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Sat Mar 17 16:54:30 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Mar 17 16:54:30 2018 +0000 |
tree | 592be473bf8610ed8ec5c4fd840d0a4f675c787d | |
parent | b162b20ed7783876eac54b3ab141e01584db5ebf [diff] | |
parent | 5219fd0a82fc2a69666a2aaf942f7b4759544b6a [diff] |
Merge "Always prefer poll over select." am: 1405a886d4 am: 5219fd0a82 Change-Id: I7b91cad3efff1342c60bdf9bc50291987fe1f3a5