commit | 738e8bbcefc1060cf9771576f77e7714bc9c17d2 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:32:14 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:32:14 2015 +0000 |
tree | 547117f668ea31f8424844206e27f34c81ed9547 | |
parent | 36a58ecb8d978f927a418e4c9719b0609b066a6f [diff] | |
parent | 070e7bf9c737392c09e8438dae7a4c772075929b [diff] |
am 070e7bf9: (-s ours) am c683cef2: (-s ours) am a2aab1aa: (-s ours) am d9662ac6: (-s ours) Import translations. DO NOT MERGE * commit '070e7bf9c737392c09e8438dae7a4c772075929b': Import translations. DO NOT MERGE