| commit | 2e3d5f561fed0874f5260b467af20fc04edf85a7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:56:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:56:22 2015 +0000 |
| tree | 2e4fa29840402692105ad74f94c8d60793334a52 | |
| parent | 718b0b16e5d7f438c0fbfd08c8beab33c4d806fa [diff] | |
| parent | 1bea2964fa709a5c06a5d4bf004c16425f87bc51 [diff] |
am 1bea2964: (-s ours) am 7bceb2e3: (-s ours) am 0975cce0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '1bea2964fa709a5c06a5d4bf004c16425f87bc51': Import translations. DO NOT MERGE