| commit | be1dc7440b3f03e795d4cacdf217b576f5a50bfe | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:28:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:28:47 2015 +0000 |
| tree | edb91ce7e7c9dc6d33389277e2e2adcac1d36854 | |
| parent | 627765c825b07ed6c6e769ae46f065cc8db935e8 [diff] | |
| parent | 942137b3e81da1e9b98e7fdf00ba7c62dbb8c922 [diff] |
am 942137b3: (-s ours) am 0497f6d3: (-s ours) Import translations. DO NOT MERGE * commit '942137b3e81da1e9b98e7fdf00ba7c62dbb8c922':