| commit | b8f608db9d7fbb06de24233c0514e0ca3f0557cd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:31:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:31:07 2015 +0000 |
| tree | be5f7e7d72a7982bf4499da1eb388d7747a630d8 | |
| parent | 2875b6dd763d3ede9d20dc6b3806b0e6208e6a55 [diff] | |
| parent | 68818b3a3004b42e59cebb8e2bab70b9888c8cbd [diff] |
am 305cf0f8: (-s ours) am 4d64bdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '305cf0f832c773a7c0d02138cea844bb3c5b0010': Import translations. DO NOT MERGE