commit | 02138871f68da0412463df022d25e6517e12939f | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Fri Feb 27 16:46:47 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 16:46:47 2015 +0000 |
tree | a4f601889b282b3e18a6d891920115c371702da6 | |
parent | f697fb7c49871b3fa9af0c365b18fcb7c853e1e7 [diff] | |
parent | 9f3c2938973788716a622ae945b48ede16a105f4 [diff] |
am 9f3c2938: (-s ours) am c3dbac7e: (-s ours) Import translations. DO NOT MERGE * commit '9f3c2938973788716a622ae945b48ede16a105f4': Import translations. DO NOT MERGE