summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Baligh Uddin <baligh@google.com> 2015-09-25 18:08:26 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-09-25 18:08:26 +0000
commite8b72edb1878aceeaabe13d3cc1b68eb81e8cc03 (patch)
tree429516b81e783bfb4ec09ab774d29d4b7510443c /opengl/java
parent58bed419ad0572e051560509ebacab5e04b8b0f1 (diff)
parentb4f7abbdaedafd3ec1bed152d74f0bdfaa96f53c (diff)
am b4f7abbd: (-s ours) am 56c2f8ee: (-s ours) am 4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'b4f7abbdaedafd3ec1bed152d74f0bdfaa96f53c': Import translations. DO NOT MERGE
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions