commit | 6b65aa4d76b63ffe07f9e9ef7bb53939e526e331 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Sat Jul 18 02:07:19 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 18 02:07:19 2015 +0000 |
tree | 4e9145baf1e622b5f8105235f1fe2f7b068cb185 | |
parent | a7c5a0d5b14d9c813e5777ab1de04f07d2b444a4 [diff] | |
parent | ab39c9200203ff83aef4fd8065ba1373c7ce1b1f [diff] |
am 4b8b79c4: (-s ours) am 4a4b14d4: (-s ours) am e30ce166: (-s ours) am 03cb97d2: (-s ours) am b8eb8f86: (-s ours) Import translations. DO NOT MERGE * commit '4b8b79c48a7b88c1179eb55d28858fc62fcfe628': Import translations. DO NOT MERGE