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