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