commit | bb0b55ccade4cbe9d122ca63b6aa893433845f73 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:17:28 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:17:28 2015 +0000 |
tree | 2f08df22f31e3a6cac5d01c0c56244f65e422e21 | |
parent | a96e623a35ce193465dd1e19887ab945af213300 [diff] | |
parent | 1c307b4ff67016e30a9951cf4de95283847bb7dd [diff] |
am 1c307b4f: (-s ours) am 28d342d4: (-s ours) am f30b80f2: (-s ours) am baf687ff: (-s ours) Import translations. DO NOT MERGE * commit '1c307b4ff67016e30a9951cf4de95283847bb7dd': Import translations. DO NOT MERGE