| commit | e6696f3961604db066125bcbef2687ba0d162aae | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 14:41:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:41:09 2015 +0000 |
| tree | 320c9ee3b5b6483992abba889a5f0240886293ab | |
| parent | 39ee7c59caea13a7bd321b777242bd03eb669a67 [diff] | |
| parent | 00c17b877ae7eab891b43319acf606e08b9064a8 [diff] |
am 00c17b87: (-s ours) am 89c7b1a4: (-s ours) am 822b0367: (-s ours) am 51a59c80: (-s ours) am a94d0f6f: (-s ours) Import translations. DO NOT MERGE * commit '00c17b877ae7eab891b43319acf606e08b9064a8':