commit | 04d3daff8006d6a8584bfc05242181119f2af096 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jul 13 16:09:05 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 16:09:05 2015 +0000 |
tree | 80a2efd067de55d15b92d26c4322f0259a701f1c | |
parent | a198e66dbe267cfb967bc6e3793b332c6cc9bb0c [diff] | |
parent | 87c8e92deaad8f10304f801224a6f9fe4400e879 [diff] |
am 87c8e92d: (-s ours) am 2676508c: (-s ours) am 4203b5d8: (-s ours) am 85a15622: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '87c8e92deaad8f10304f801224a6f9fe4400e879': Import translations. DO NOT MERGE