commit | a4cd63f6cc3a835ab268a9854f5ea8d7f41342c0 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 05 12:55:55 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 05 12:55:55 2015 +0000 |
tree | 7501da73d6c325513cf56566749cb0dda39437da | |
parent | 82c61b2dd878eae9a30bd7953bf3e2390e1e5611 [diff] | |
parent | 032262578565c928b47996d096f3518cf1f09aa7 [diff] |
am 03226257: (-s ours) am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE * commit '032262578565c928b47996d096f3518cf1f09aa7': Import translations. DO NOT MERGE