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