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