| commit | 3412e978a008d86463013e7fd5ce88f31315491b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 18:13:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 18:13:55 2015 +0000 |
| tree | f87ccfc6751cbf5d0e97ea7d4dcc197baee787e3 | |
| parent | aebead61c4eba368997446135f48e87f13ef3e3d [diff] | |
| parent | 7c6a1584cc0ed4ca0601e8607e053373d0e2e11b [diff] |
am 7c6a1584: (-s ours) am 7a444f7a: (-s ours) Import translations. DO NOT MERGE * commit '7c6a1584cc0ed4ca0601e8607e053373d0e2e11b': Import translations. DO NOT MERGE