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