| commit | e23de7376a6ecb19997aa4ae075d27252bce8694 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 29 14:30:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 14:30:04 2015 +0000 |
| tree | 56217c46306b3dfeff9eda260218fcf053a2503d | |
| parent | 87a4f832928f3a795490b8a048aba481bcb5e4b2 [diff] | |
| parent | 7d49d182a2ebc7742bb0d9a89cae6daeaf4a5148 [diff] |
am 7d49d182: (-s ours) am 6a7af7a6: (-s ours) am 3e9a75b7: (-s ours) Import translations. DO NOT MERGE * commit '7d49d182a2ebc7742bb0d9a89cae6daeaf4a5148': Import translations. DO NOT MERGE