| commit | 43369669b51efa39dd983b3a194611da3601285e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 18:17:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 18:17:47 2015 +0000 |
| tree | d2c9e7eaae6f7959467aa49d6fb744e81475c8c2 | |
| parent | ab4860f5e90dfac6bd6c4e0cd6543d8b4afa7cb2 [diff] | |
| parent | 1582fb37b3f57e5de068fb16d2e70ea8c74ea786 [diff] |
am 1582fb37: (-s ours) am b1670808: (-s ours) am 09265698: (-s ours) Import translations. DO NOT MERGE * commit '1582fb37b3f57e5de068fb16d2e70ea8c74ea786': Import translations. DO NOT MERGE