| commit | 4c3ac5a2a5a8ba22ae9f8263fc4db11cf8fa3c19 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 19:21:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 19:21:34 2014 +0000 |
| tree | fea2d8149b3072740e7ad75752ebabaeecd6eb57 | |
| parent | c160942009747135472509b00c3a97b4462cec0f [diff] | |
| parent | b04130409494065d36e4bf4a602716de8836e0f5 [diff] |
am b0413040: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'b04130409494065d36e4bf4a602716de8836e0f5': Import translations. DO NOT MERGE