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