| commit | f5c7024d83856bc5f50006db0c36d5451edfbe9a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 08 13:03:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 13:03:09 2015 +0000 |
| tree | d5138d7cc44a3569dbe193af5ca6757712689887 | |
| parent | 896ac8b5c9aecb39261f457adcf33415f9c94e77 [diff] | |
| parent | 1ddf42670d30c193920965d6a2f89d57d659d5e8 [diff] |
am 09b6969e: (-s ours) am 32e0b1df: (-s ours) am 5aaefd0a: (-s ours) Import translations. DO NOT MERGE * commit '09b6969e6a820fed0fa7d7b5553c6d5ef0d52b61': Import translations. DO NOT MERGE