diff options
author | Baligh Uddin <baligh@google.com> | 2014-03-20 19:02:35 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 19:02:35 +0000 |
commit | 1c0e52d68b3b42ef7efbad7e6f881dcc75c3f452 (patch) | |
tree | 0de18780b61f01a892da197f6b2ca9ddfe2e0603 | |
parent | 1c79addfcbe26d3327b58e0ba8dc42c7c19963a9 (diff) | |
parent | c1f2a2135162a48607a3e333b13b8e36e62732d9 (diff) |
am c1f2a213: (-s ours) am ea8ec3cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c1f2a2135162a48607a3e333b13b8e36e62732d9':
Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions