commit | 511a1aca49587e07c1dc1b33eb216973875c1395 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jun 29 14:08:14 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 29 14:08:14 2015 +0000 |
tree | 152389a1aeb3c67afd1bfdaae9f1528a98320373 | |
parent | 62efaf1588d4c8e365dd8fd8f0ed99fed5ad4f01 [diff] | |
parent | e3fc5415ed65ee7ad451069022b5405361aeb2e7 [diff] |
am e3fc5415: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'e3fc5415ed65ee7ad451069022b5405361aeb2e7': Import translations. DO NOT MERGE