diff options
| author | Geoff Mendal <mendal@google.com> | 2015-03-04 14:20:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-04 14:20:25 +0000 |
| commit | e901c4262bc66ee89dddedd281d42f0c468c96bf (patch) | |
| tree | 59a0e719c2efadb66387c2bf2bfb8760b580435a /opengl/java | |
| parent | aee73e3d114b0f030419c47827dd1b1adb73cc32 (diff) | |
| parent | 850fd489dea0cdf7199cce73027fc95658b0993f (diff) | |
am 850fd489: (-s ours) am b214417a: (-s ours) am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '850fd489dea0cdf7199cce73027fc95658b0993f':
Import translations. DO NOT MERGE
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions