| commit | 55c01896f835bf6ec5352c681969fcc47ce14393 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 30 21:02:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 30 21:02:30 2014 +0000 |
| tree | 07f323c4bdd5dfe97bc5bac18e5e426eee57d4a7 | |
| parent | 36b20913685569d2a12c8caf8b4254f1a823b92a [diff] | |
| parent | e68475c02fab2386997f089652d12e3f6188481b [diff] |
am e68475c0: (-s ours) am 5874b8c6: (-s ours) am 85a7c04f: (-s ours) Import translations. DO NOT MERGE * commit 'e68475c02fab2386997f089652d12e3f6188481b': Import translations. DO NOT MERGE