| commit | 13504870ce44a8d38ea61c362d05818ebcf7c7ad | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu May 14 18:03:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 14 18:03:51 2015 +0000 |
| tree | 3d8ce08ec4487737b61fdf0f628db9cf0ac64cf8 | |
| parent | 810ed45e06809630542a39450c9c4c462d16dc47 [diff] | |
| parent | 50911cd2e85dadff33a4599c1f9c3309ff7b456c [diff] |
am 50911cd2: (-s ours) am f2468299: (-s ours) am 5c26ba7d: (-s ours) Import translations. DO NOT MERGE * commit '50911cd2e85dadff33a4599c1f9c3309ff7b456c': Import translations. DO NOT MERGE