| commit | 316548e34476ef75c3ccf8a01366b292927122b6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 15 16:27:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 15 16:27:19 2015 +0000 |
| tree | 1def158efc4487b3fd05239ec99393930895e61e | |
| parent | fa04b7c2798dbb623e9b5e20796ce413feafacfc [diff] | |
| parent | 40f7418d812200b54fd57459b4b6b317850c1734 [diff] |
am 40f7418d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '40f7418d812200b54fd57459b4b6b317850c1734': Import translations. DO NOT MERGE