| commit | 2d64738539db8e088bf4d24771e7c761a2393144 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Sep 29 21:18:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 29 21:18:51 2014 +0000 |
| tree | be4ce7afed9f502dcf5d0bd715625ff302928bc9 | |
| parent | d555350cbc2ca09a6edf91760d9ca3d6b1663240 [diff] | |
| parent | 42c99c0739d6245be138dab853bf3a9835261394 [diff] |
am 3e8b5321: (-s ours) am 9a4c67b2: (-s ours) am e9c7f420: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '3e8b5321a1cfbde5aa2bb51dc8daa4314e827ba2': Import translations. DO NOT MERGE