| commit | eefda919c3ee1f26ea5a0134e1bdd26882169108 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Oct 27 18:51:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 18:51:15 2014 +0000 |
| tree | 35177ce3c6cf8d873ea0f220bd9dc71fa69105f3 | |
| parent | c494a3a1677807fea2ea3522b8e0de231014d167 [diff] | |
| parent | 83203a847a2abb3dbdccc995c34afef648b461f4 [diff] |
am 83203a84: (-s ours) am 4f4ef946: (-s ours) Import translations. DO NOT MERGE * commit '83203a847a2abb3dbdccc995c34afef648b461f4':