commit | c44f6cd011d20ee5acae7680baa6f16791b3de18 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:48:30 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:48:30 2015 +0000 |
tree | cee3dfbd0a2df6ca7e9a8559c1a24d2b1bb4339a | |
parent | c9f7a624bd7d58b7be3a80659aa91ddba80e5b97 [diff] | |
parent | 75443c18c90684e0719f71499613f23c6181dbfd [diff] |
am 75443c18: (-s ours) am 2cbb2d13: (-s ours) am a7866cd9: (-s ours) Import translations. DO NOT MERGE * commit '75443c18c90684e0719f71499613f23c6181dbfd': Import translations. DO NOT MERGE