commit | b6cc23ff6e551d1b8fcf2757e7f62186b3b87710 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Sat Aug 01 16:45:47 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 16:45:47 2015 +0000 |
tree | a30c4f1ac8f2bbe7db9cdc7853307082cf2e69b0 | |
parent | ec234355575c8472ec000138320f7d042f5283a8 [diff] | |
parent | ec5371e4a7398bd872c536f828aa1f157e082741 [diff] |
am ec5371e4: (-s ours) am 480c600d: (-s ours) am 97e3b5fc: (-s ours) Import translations. DO NOT MERGE * commit 'ec5371e4a7398bd872c536f828aa1f157e082741': Import translations. DO NOT MERGE