summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Geoff Mendal <mendal@google.com> 2015-10-26 19:59:46 +0000
committer android-build-merger <android-build-merger@google.com> 2015-10-26 19:59:46 +0000
commit33fcff80867c4ebfa40ea14ba057ca65ad07d6a3 (patch)
treea433eab9adbeeb011e2c448f99c184cbb8cd540a /opengl/java
parenteac54076f236b1adade399a95e9298597ae92ee3 (diff)
parentdd21740d6b6ec56e812cd2845c85fe3efd3e3e6a (diff)
Merge "Import translations. DO NOT MERGE" into cw-e-dev am: db4f28692a -s ours am: ad3bd48dfe -s ours
am: dd21740d6b -s ours * commit 'dd21740d6b6ec56e812cd2845c85fe3efd3e3e6a': Import translations. DO NOT MERGE
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions