summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Geoff Mendal <mendal@google.com> 2015-03-04 13:47:51 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-03-04 13:47:51 +0000
commit3e938519e3b11251c5eae308276a7217fb7c6572 (patch)
tree7d5baa6fdc44257dc28edef4cc78070ea8293bc7 /opengl/java
parent97735297307eccc3cedb537fe88a2a76d473f798 (diff)
parent80b9bd854365bf052db9572bcff0fedf74090ff5 (diff)
am 80b9bd85: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '80b9bd854365bf052db9572bcff0fedf74090ff5': Import translations. DO NOT MERGE
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions