commit | 91ee79ab60dfd032f7ebfcc5441c4392321369da | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 01 19:02:56 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 01 19:02:56 2015 +0000 |
tree | 4cc9119ece35e353d16d8e279b878ac6d1e313de | |
parent | c04243573c1da867499e0677485ca14d2dd8c9ad [diff] | |
parent | f377cbc7be8f2896566f6093819df9b2497fac83 [diff] |
am f377cbc7: (-s ours) am b05b14e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'f377cbc7be8f2896566f6093819df9b2497fac83': Import translations. DO NOT MERGE