| commit | 3802c6271e136f4e1f82494ee676eb2051bf6698 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:11:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:11:05 2015 +0000 |
| tree | 99a4a0245b1f92b89c7bdbf884009659963f54a6 | |
| parent | 8241b72bf21008d60e1822042c1e8433c8eb4a64 [diff] | |
| parent | e6ce8d2a9bfc4c42f93961f924c59b3aba40e543 [diff] |
am 4e8349bb: (-s ours) am f998875f: (-s ours) am 3e2d53b0: (-s ours) Import translations. DO NOT MERGE * commit '4e8349bb8a7558781c96e1c27f41541485fcd7f3': Import translations. DO NOT MERGE