| commit | b47058a2b95e89e826249dee7a97a8f6f2eb1afa | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 13:48:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 13:48:20 2014 +0000 |
| tree | 570273b1a96cb75dc0d8a6d7005e7849a3690e71 | |
| parent | 0d3013af42f6ffd8edd2b71ec05c325d06e9da71 [diff] | |
| parent | 847bb7ce2cdb94496494dbae319f83e8392ebf16 [diff] |
am 847bb7ce: (-s ours) am 58ae133a: (-s ours) am ef6c6c6f: (-s ours) am fd052e05: (-s ours) Import translations. DO NOT MERGE * commit '847bb7ce2cdb94496494dbae319f83e8392ebf16': Import translations. DO NOT MERGE