| commit | bd7caa7c1c0c7ad871e76554975003f9be7646e5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:57:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:57:05 2015 +0000 |
| tree | 18c580693446704f3d1e39d971c7b9d293e4c25b | |
| parent | aa90ab551c9ba08489feae32c71efabac51062cc [diff] | |
| parent | 97eabdbdc943ec361de9cb948676a75adc2723e8 [diff] |
am 97eabdbd: (-s ours) am f427688c: (-s ours) am e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '97eabdbdc943ec361de9cb948676a75adc2723e8': Import translations. DO NOT MERGE