commit | d0e9db59d732ec83ac21d72abe24f41f978eb833 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sat Aug 16 04:19:49 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 16 04:19:49 2014 +0000 |
tree | c5581aeefcf428301570147204faed4d3c535b5e | |
parent | 0141922cb6ea4eb5629a72b486def5b21ca06dc8 [diff] | |
parent | 2abea6c457e869e18da9a32fed548874384add96 [diff] |
am 546677e3: (-s ours) am 129ad0e1: (-s ours) am ad6b1426: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '546677e326241b1dd3131b57cc3e740b277d44d2': Import translations. DO NOT MERGE