| commit | 87c8e92deaad8f10304f801224a6f9fe4400e879 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:56:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:56:26 2015 +0000 |
| tree | 2e4fa29840402692105ad74f94c8d60793334a52 | |
| parent | 2e3d5f561fed0874f5260b467af20fc04edf85a7 [diff] | |
| parent | 2676508c490833104929db90c4d82177dd38ab0e [diff] |
am 2676508c: (-s ours) am 4203b5d8: (-s ours) am 85a15622: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '2676508c490833104929db90c4d82177dd38ab0e': Import translations. DO NOT MERGE