| commit | 49cf8b4e69ff66e7a7bf174ab2915a3663ffd394 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Jul 30 00:05:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 30 00:05:29 2015 +0000 |
| tree | 0734c5bbd5a98ca48ca90bbb9b0c4cc22146e7b0 | |
| parent | e7da8113de6f76fb82d2fa2cda92e3c433a835a2 [diff] | |
| parent | 939a5a265e77119ed824b83d72abe0d62fdcec32 [diff] |
am 939a5a26: (-s ours) am da4cd376: (-s ours) am 0c44c231: (-s ours) am 0497f6d3: (-s ours) Import translations. DO NOT MERGE * commit '939a5a265e77119ed824b83d72abe0d62fdcec32': Import translations. DO NOT MERGE