| commit | e8fa5b82614853bc4fd200400bfb6c391ffa5eef | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 29 14:24:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 14:24:10 2015 +0000 |
| tree | 838af24d7bfdb4a914af81d8e478284e830ce023 | |
| parent | d14bdc636c652150f4e404b7ff1180a9cd8816bd [diff] | |
| parent | 5ad243ba179248b91e38daa131fdf55c07763428 [diff] |
am 5ad243ba: (-s ours) am 072315a3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '5ad243ba179248b91e38daa131fdf55c07763428': Import translations. DO NOT MERGE