| commit | a2118c43b2a78a42f1e21d716864cb6a3de6cf0c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 17 16:26:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 17 16:26:27 2015 +0000 |
| tree | 77ae5726a74f061821acba2da88d881665749c23 | |
| parent | 9bc414a254c751f88a362f519550f43ffdd5f03f [diff] | |
| parent | d9617fe5b80f94a30efa7b38ec033bbad2023dfb [diff] |
am d9617fe5: (-s ours) am 434770d5: (-s ours) am 5f5c4b23: (-s ours) am ea49b2f6: (-s ours) Import translations. DO NOT MERGE * commit 'd9617fe5b80f94a30efa7b38ec033bbad2023dfb': Import translations. DO NOT MERGE