| commit | 22a0c0e3dc4198acab5828687a306d291288ad25 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 29 14:42:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 14:42:58 2015 +0000 |
| tree | 27538a6101c75339440c743ff698bddea7539dc9 | |
| parent | 9b552e34004747166ad3d0f0789fb54f3a7f3094 [diff] | |
| parent | 0fb5f9f337292bd7ac4e380be72ffbaf9dccf51b [diff] |
am 0fb5f9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '0fb5f9f337292bd7ac4e380be72ffbaf9dccf51b': Import translations. DO NOT MERGE