diff options
author | Xavier Ducrohet <xav@google.com> | 2015-02-13 00:50:37 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-13 00:50:37 +0000 |
commit | e6747a78d2210056f6bcb990b0887de0b417a7d5 (patch) | |
tree | a8bdd20587ea115d9c186de685adafa80f70080d /emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.cpp | |
parent | 42884eb368a29ad741543536d28748d159bc8e96 (diff) | |
parent | ba367d5ec3aff467df7aca294dc42ac3b95f5c8a (diff) | |
download | sdk-e6747a78d2210056f6bcb990b0887de0b417a7d5.zip sdk-e6747a78d2210056f6bcb990b0887de0b417a7d5.tar.gz sdk-e6747a78d2210056f6bcb990b0887de0b417a7d5.tar.bz2 |
am ba367d5e: Merge "Revert "Add targetPlatform for executable binaries"" into studio-1.2-dev automerge: 2c05810 automerge: 3b7b0b5
* commit 'ba367d5ec3aff467df7aca294dc42ac3b95f5c8a':
Revert "Add targetPlatform for executable binaries"
Diffstat (limited to 'emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.cpp')
0 files changed, 0 insertions, 0 deletions