diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-02-05 22:40:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-05 22:40:56 +0000 |
| commit | 8ab5c13b8161ecb1dab460b8b2b9020f17eef790 (patch) | |
| tree | f1d698bc5542daf7f6db2027805b8736421e0748 /emulator/opengl/shared/OpenglCodecCommon/TcpStream.cpp | |
| parent | ad4387f29d09fd900b12435a3a45b4d5b6bb85e8 (diff) | |
| parent | 48965bc07b756ae551222f270a3d3054186d5683 (diff) | |
| download | sdk-8ab5c13b8161ecb1dab460b8b2b9020f17eef790.zip sdk-8ab5c13b8161ecb1dab460b8b2b9020f17eef790.tar.gz sdk-8ab5c13b8161ecb1dab460b8b2b9020f17eef790.tar.bz2 | |
Merge "pixel perfect: Disable controls" into studio-1.1-dev automerge: b234933 automerge: e50f48d
automerge: 48965bc
* commit '48965bc07b756ae551222f270a3d3054186d5683':
pixel perfect: Disable controls
Diffstat (limited to 'emulator/opengl/shared/OpenglCodecCommon/TcpStream.cpp')
0 files changed, 0 insertions, 0 deletions