| commit | ab474588ce7d9cddff2b2dc0a2fd91b4ae532e05 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Oct 18 16:05:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 18 16:05:43 2014 +0000 |
| tree | 0f766fb63af0a6adb185024e534bb81d76983236 | |
| parent | e43f0d646c60c6f59333224686725717cdf2ccbc [diff] | |
| parent | 1004713867fa4476201c02c95f35c64361a6dcf2 [diff] |
am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit '1004713867fa4476201c02c95f35c64361a6dcf2': Import translations. DO NOT MERGE