commit | 7b03d10f58453873e1527384e9cdc579858d9d67 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Sep 30 20:21:19 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 30 20:21:19 2015 +0000 |
tree | 02193d05aecf182b9eedb4e18447918358f5613b | |
parent | 48fab9d10ab12fb015e964e0e766091f485843ef [diff] | |
parent | 21416b8318ae2dd63296a255ae8bc0f0bdda1fa4 [diff] |
am 21416b83: (-s ours) am 1207a501: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '21416b8318ae2dd63296a255ae8bc0f0bdda1fa4': Import translations. DO NOT MERGE