| commit | 4dae637fcc1dee64fb6edb279d7c9f2578b717ed | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 07 00:40:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 00:40:03 2014 +0000 |
| tree | c173488eaf6735be483ff771f35e3adcadd382ed | |
| parent | 59f7c4c749fb69c9f83a3d28784147a941fecc58 [diff] | |
| parent | 17cef23480b7cb05ce35cc3e666d3871352c495c [diff] |
am 17cef234: (-s ours) am 6a6369b6: (-s ours) am fc8d6519: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '17cef23480b7cb05ce35cc3e666d3871352c495c': Import translations. DO NOT MERGE