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