aboutsummaryrefslogtreecommitdiffstats
path: root/emulator/opengl/host/tools
diff options
context:
space:
mode:
authorbohu <bohu@google.com>2014-11-25 20:58:20 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-11-25 20:58:20 +0000
commita01dd53f93a56259ab600266b67ee387e1795629 (patch)
tree8212fda6421e438a5879bb4da21eb3495f20b6f0 /emulator/opengl/host/tools
parenta4e476b96e74327a43031800110a98b197a53c68 (diff)
parent2cd704d9f6686cd4aa9088b7d86aa3e507974b2b (diff)
downloadsdk-a01dd53f93a56259ab600266b67ee387e1795629.tar.gz
sdk-a01dd53f93a56259ab600266b67ee387e1795629.tar.bz2
sdk-a01dd53f93a56259ab600266b67ee387e1795629.zip
Merge "Correctly set error code" into studio-1.0-dev automerge: 7b26ed5
automerge: 2cd704d * commit '2cd704d9f6686cd4aa9088b7d86aa3e507974b2b': Correctly set error code
Diffstat (limited to 'emulator/opengl/host/tools')
0 files changed, 0 insertions, 0 deletions