commit | 0141922cb6ea4eb5629a72b486def5b21ca06dc8 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sat Aug 16 04:19:45 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 16 04:19:45 2014 +0000 |
tree | c5581aeefcf428301570147204faed4d3c535b5e | |
parent | 92c91c7f7a61aa1fbbc5d0a5ab25195bb03d0f4c [diff] | |
parent | 0be2a432847ecff029797228c58d744c6041844b [diff] |
am dfc65278: (-s ours) am 062feaf3: (-s ours) am 2f53238f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit 'dfc6527815c81a0a9c5ae62140987f96ff49cdf8': Import translations. DO NOT MERGE