commit | 7f94de36918e5212bf618e05fd843e0d115c19a6 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 29 13:07:07 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 13:07:07 2015 +0000 |
tree | d09071e1cc885700650ee6c073368ae9cdfc71f4 | |
parent | ce9304605a29d6dd153b092f1e354b0df09b586b [diff] | |
parent | 0e42eb5448923c76f8f12f9c5e994eefdf459237 [diff] |
am 0e42eb54: (-s ours) Import translations. DO NOT MERGE * commit '0e42eb5448923c76f8f12f9c5e994eefdf459237': Import translations. DO NOT MERGE