| commit | 921ce56c7e96bf7ab9daf29dccfe237b4072638c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 22:04:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 22:04:39 2015 +0000 |
| tree | b040c010aa977e471265a51a8b1cc561c7910c64 | |
| parent | 78d91bc3e43222f95fcd34f08c1349675c8f1e4a [diff] | |
| parent | ac5803b0c1e5a5db80ff0ea19dfe7fb1a053f977 [diff] |
am 3e64f2bb: (-s ours) am 91235c51: (-s ours) am 37029d3a: (-s ours) Import translations. DO NOT MERGE * commit '3e64f2bb52ab94b20ab5079702f2b8e069e465aa':