commit | cb1486d0fa703866c29d11872588215259e819fd | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 08 14:47:53 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 14:47:53 2015 +0000 |
tree | a74e61178bba7a80142a5d65774340c28363c153 | |
parent | 12ceccaf7aa4198bb578bcba844729c0ac146d6d [diff] | |
parent | 1fee49529e6310a2fc163f004e5f5299d006cb2f [diff] |
am 1fee4952: (-s ours) am 1e9b3cff: (-s ours) am 18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '1fee49529e6310a2fc163f004e5f5299d006cb2f': Import translations. DO NOT MERGE