| commit | a378003ad985b77a680338ede1782d0811caaf72 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 20 15:06:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 15:06:15 2015 +0000 |
| tree | 8c268b19c5eccd7b412fd70adb32abf441c00050 | |
| parent | ff786de2e583c000e86fdc577270a46ae499ef65 [diff] | |
| parent | 540949bedc17b25cde674761e8cd43114abe9a4c [diff] |
am 540949be: (-s ours) am 19e5cd85: (-s ours) Import translations. DO NOT MERGE * commit '540949bedc17b25cde674761e8cd43114abe9a4c': Import translations. DO NOT MERGE