| commit | 36b1d40a6aeb8d444daf4d5e5c5b1014f35e1c32 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 29 14:17:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 14:17:43 2015 +0000 |
| tree | 3fd819340fe0e39c35c8b9698099ed3865d14a31 | |
| parent | 5ad243ba179248b91e38daa131fdf55c07763428 [diff] | |
| parent | cf37ac98a7e7cb3c09d3c9be11222fc81ec9ada5 [diff] |
am cf37ac98: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit 'cf37ac98a7e7cb3c09d3c9be11222fc81ec9ada5': Import translations. DO NOT MERGE