| commit | 72e69bd96c8aa2bd689657a4fcd9a80736b980fc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Jan 29 01:11:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 01:11:37 2015 +0000 |
| tree | 2ef54c527c645167369d27cd0bb02d6e59f4baa5 | |
| parent | 7b5472bfab28b35f4a054a14dd945c6ef75daa06 [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