| commit | 7aa04e1cd255cc32b4eb1d57c390987f47d005ce | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:11:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:11:03 2015 +0000 |
| tree | 5790008aa949ab3f982a6b6f114152e972156e6b | |
| parent | be8fd87062ce543add59957508e2096db8929676 [diff] | |
| parent | 2e59d40c14bfc7bb640eb5d078f0623bd2ed97de [diff] |
am 2e59d40c: (-s ours) am 41fd61c5: (-s ours) am 1074d6d4: (-s ours) Import translations. DO NOT MERGE * commit '2e59d40c14bfc7bb640eb5d078f0623bd2ed97de': Import translations. DO NOT MERGE