commit | 47b04832a58ab1c52582a792c45b03d578220733 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Aug 19 14:27:32 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 19 14:27:32 2015 +0000 |
tree | fe3eca847df60d9d96680052f34ce6d3b5b2f92e | |
parent | da1404d02d22dde2cd4e79eaed46a48e40eefe29 [diff] | |
parent | 5b9e3290062e4065aeb45085ea908b81c1fbe909 [diff] |
am 5b9e3290: (-s ours) am 257a9a87: (-s ours) am 81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '5b9e3290062e4065aeb45085ea908b81c1fbe909': Import translations. DO NOT MERGE