commit | cee2ad1148824660e6db46b09de7b8bd2adfd110 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Apr 29 14:51:11 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 29 14:51:11 2015 +0000 |
tree | ff4d8269f69130c37c210241887d5be7a65617dd | |
parent | 0baa3b46156805d5875867c55290b4113f4b61b4 [diff] | |
parent | 62c2a7337b60b60ab0204572a792e88f9d99684e [diff] |
am 62c2a733: (-s ours) am 6b960a9e: (-s ours) am e1b43ee9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '62c2a7337b60b60ab0204572a792e88f9d99684e': Import translations. DO NOT MERGE