diff options
| author | Geoff Mendal <mendal@google.com> | 2015-03-04 13:54:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-04 13:54:41 +0000 |
| commit | 0e8baf3ca671deb81b27e84281d87b1e4928b054 (patch) | |
| tree | 59a0e719c2efadb66387c2bf2bfb8760b580435a /opengl/java | |
| parent | 0d6246a660f05275333b97ce04222621489f6b85 (diff) | |
| parent | 3e938519e3b11251c5eae308276a7217fb7c6572 (diff) | |
am 3e938519: (-s ours) am 80b9bd85: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '3e938519e3b11251c5eae308276a7217fb7c6572':
Import translations. DO NOT MERGE
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions