| commit | f68020abf3a51ffefcf3cd8d2043684501b6f3ce | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon May 04 15:05:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 04 15:05:16 2015 +0000 |
| tree | 9b72b84465aad221d2f101765082bd7b69c45567 | |
| parent | 4aa8c7df2e09892c305cf9984ecf1916fa034e7f [diff] | |
| parent | ffdbf7da246ccc9fe9722c1e3fca84f97f96dd88 [diff] |
am ffdbf7da: (-s ours) am cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'ffdbf7da246ccc9fe9722c1e3fca84f97f96dd88': Import translations. DO NOT MERGE