diff options
| author | Siva Velusamy <vsiva@google.com> | 2015-03-20 22:17:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 22:17:10 +0000 |
| commit | fc2a7dfe9350400514c8e21023ea2ef46266f712 (patch) | |
| tree | d645d524e8c101ea69acdae0f297d94e19cc8055 /emulator/opengl/tests/event_injector/sockets.h | |
| parent | d08f74908ccebd13ebd5298554320aea94da55a0 (diff) | |
| parent | 35e336b1c6378da70c891ad68ebee662414b52c1 (diff) | |
| download | sdk-fc2a7dfe9350400514c8e21023ea2ef46266f712.zip sdk-fc2a7dfe9350400514c8e21023ea2ef46266f712.tar.gz sdk-fc2a7dfe9350400514c8e21023ea2ef46266f712.tar.bz2 | |
am 35e336b1: am 956b01fd: Merge "gltrace: Increase launch timeout" into idea133 automerge: 1d55d41
* commit '35e336b1c6378da70c891ad68ebee662414b52c1':
gltrace: Increase launch timeout
Diffstat (limited to 'emulator/opengl/tests/event_injector/sockets.h')
0 files changed, 0 insertions, 0 deletions