commit | 013b37a7e91e27eb060a6a23ac607a7172f2b058 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Mar 26 18:56:15 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 18:56:15 2015 +0000 |
tree | 2ef54c527c645167369d27cd0bb02d6e59f4baa5 | |
parent | 3a496eb86cf9db788874d1b0e4628a9c3efd1a2d [diff] | |
parent | a9431f676d472cb6b103f9d99e9c64de7d161f57 [diff] |
am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'a9431f676d472cb6b103f9d99e9c64de7d161f57': Import translations. DO NOT MERGE