| commit | 608f228933c00d122a3fb32bf02f3a80ac364dfc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 10 18:23:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 10 18:23:23 2015 +0000 |
| tree | b8dcd7648281d6eb09d2957516052f61de946f39 | |
| parent | e869b3981506537dabbd1011df94f1e69ce84495 [diff] | |
| parent | 31a0f46f5feb8aab38cc46cc2a8d48c080a3fd96 [diff] |
am 31a0f46f: (-s ours) am 3ea5cfa8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '31a0f46f5feb8aab38cc46cc2a8d48c080a3fd96': Import translations. DO NOT MERGE