| commit | ace1754961d5b6b640e43a2aad0189cd62821a53 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Mar 20 19:04:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 19:04:18 2014 +0000 |
| tree | 2767d2dfaf985c8c8637e3dbdb3c57ca011a3083 | |
| parent | 7c81d01e39a825c6bf6aa2b8382de3848db336a0 [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