| commit | 082c424f1a57bc8a0c3d6e434b89d038fa8e6031 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 14:43:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:43:14 2015 +0000 |
| tree | ddb7904f3df54c14a2f72f0fd2c7645a602433d5 | |
| parent | 724b193edcc02c94626cf9150135a102c15167c4 [diff] | |
| parent | 9e85a4bb2e08efcbc3226a20b33cf82725011e97 [diff] |
am 9e85a4bb: (-s ours) am 74b193c5: (-s ours) am ae1c4b2c: (-s ours) Import translations. DO NOT MERGE * commit '9e85a4bb2e08efcbc3226a20b33cf82725011e97':