| commit | 256e2ffddf7e22bdf201c44a880a36e73b8f8fbe | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 18:55:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 18:55:58 2015 +0000 |
| tree | 2ef54c527c645167369d27cd0bb02d6e59f4baa5 | |
| parent | f4d53d6fdad4335e817c6f71e730b0cf0165de0a [diff] | |
| parent | cad0777a4bade34d6bedd096eae712e29df99fc1 [diff] |
am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'cad0777a4bade34d6bedd096eae712e29df99fc1': Import translations. DO NOT MERGE