| commit | 57e258992539de135f8694be798ae11576c1cd33 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 16 16:51:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 16:51:08 2014 +0000 |
| tree | 35fe6b8133e0bb525364e085a6b3b5d54a02acec | |
| parent | 30cfe2fd5251ca737b59fe16eaef5907907a6e89 [diff] | |
| parent | 6cd29c10db48187a6a59138ce74129e215ac8e34 [diff] |
am 6cd29c10: (-s ours) am b979cd54: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '6cd29c10db48187a6a59138ce74129e215ac8e34': Import translations. DO NOT MERGE