commit | b4f357078b3423a9789bfcc34568db3f34bc21c2 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Aug 03 17:01:01 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 03 17:01:01 2015 +0000 |
tree | 07dada45e98b0b0f736f475c2629adcc94a68fa6 | |
parent | f489020fed3f45df4645ff4a23843c7463b3e0f0 [diff] | |
parent | c3ad37403078e45dea96dfc273859082d749c799 [diff] |
am c3ad3740: (-s ours) am d36380cc: (-s ours) am 7e1c227e: (-s ours) am 91ddd4ad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit 'c3ad37403078e45dea96dfc273859082d749c799': Import translations. DO NOT MERGE