| commit | c4ee93a22e0e5c4a7a4107b21d8d5f20cfcc0525 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Sep 03 17:28:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 03 17:28:42 2015 +0000 |
| tree | 208bd2e8f87fb9cae755c7645eeb96cc40ed8e9c | |
| parent | c31bfb2dca0c95de1012566ac586ab1f18c7ccd7 [diff] | |
| parent | 10c447c2cdb09ec1bb092d35fb93911aeccbc2e4 [diff] |
am 10c447c2: (-s ours) am 532ebb9f: (-s ours) am 8ee8b379: (-s ours) am e182fa77: (-s ours) Import translations. DO NOT MERGE * commit '10c447c2cdb09ec1bb092d35fb93911aeccbc2e4': Import translations. DO NOT MERGE