commit | 6e22f1e2237fb9ab152c6137129b9efad466160a | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Nov 07 15:53:25 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 15:53:25 2014 +0000 |
tree | b9bef752e9d21fd66919ce1ec48f23db56890469 | |
parent | b1f3f079fc394624d78db9a60b2700cf3845a95e [diff] | |
parent | 05908e3e875a902d2965d57529062dd5461ddac3 [diff] |
am 05908e3e: (-s ours) am 6330584b: (-s ours) Import translations. DO NOT MERGE * commit '05908e3e875a902d2965d57529062dd5461ddac3': Import translations. DO NOT MERGE