| commit | e6b134555d370609682affbf31a5f98fffc7db3a | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 02 12:37:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 02 12:37:44 2014 +0000 |
| tree | 946b62f19b072339b4dab846ff88e74659be0cd5 | |
| parent | be9d6a60b5098b75d3f3a1b7ff16d810065fb600 [diff] | |
| parent | c999d58bcca65ed61102a66dcdd5a3b38664f393 [diff] |
am c999d58b: (-s ours) am d66d331c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'c999d58bcca65ed61102a66dcdd5a3b38664f393': Import translations. DO NOT MERGE