commit | 3f287849a9844cb2f9072cf0f135a20a14eefa72 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jul 20 13:58:03 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 13:58:03 2015 +0000 |
tree | 999ec56c09b7f188e75f6dcb40b3b779a0cb60f2 | |
parent | 562c8f0f6a4e6c5be4d6c92630d02bdeb2341aa8 [diff] | |
parent | 1bb57890a25e895f9b27ef557ca6a2f83dee8812 [diff] |
am 1bb57890: (-s ours) am 8eae5068: (-s ours) am 69a7483e: (-s ours) Import translations. DO NOT MERGE * commit '1bb57890a25e895f9b27ef557ca6a2f83dee8812': Import translations. DO NOT MERGE