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