| commit | f8b7b16c645896d3f8ef697ee06bbb7bc20921e3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 00:43:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 00:43:22 2015 +0000 |
| tree | c4139c8d991713b44d1b46903603dd1fa32197bb | |
| parent | 40aa30b3747fc62b14832682d2cc3117edd93b80 [diff] | |
| parent | d307a122aef6f06cd7983f2d9384be09f9d89eea [diff] |
am d307a122: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit 'd307a122aef6f06cd7983f2d9384be09f9d89eea': Import translations. DO NOT MERGE