| commit | 6de722ad64d29f2268f44a5aee61e4dd2685c450 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 00:43:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 00:43:34 2015 +0000 |
| tree | c4139c8d991713b44d1b46903603dd1fa32197bb | |
| parent | 37cf19e4e7072582f1e754c6576ece7d2b8992f3 [diff] | |
| parent | 46c5d0b157de2fb9249a1ce0e8695bb985cdb093 [diff] |
am 46c5d0b1: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '46c5d0b157de2fb9249a1ce0e8695bb985cdb093': Import translations. DO NOT MERGE