| commit | ad1e8ccb816677184215f30231a921599a78f76a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 18:13:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 18:13:24 2015 +0000 |
| tree | 4326defe6a8718dba65ffca6226e302516a9624b | |
| parent | 87478ab5f6f86de9cf1c3f6eb3a705eff57c35d8 [diff] | |
| parent | 72879d40ce7a13f4e3ed18edd83f3bd7c2841b1b [diff] |
am 72879d40: (-s ours) am cf51139c: (-s ours) am 494d2237: (-s ours) am a83129f0: (-s ours) am e5ec4ac4: (-s ours) Import translations. DO NOT MERGE * commit '72879d40ce7a13f4e3ed18edd83f3bd7c2841b1b': Import translations. DO NOT MERGE