commit | fa7085eb874984cbc265abb4460656010335fabe | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Mon Jul 07 18:09:19 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 07 18:09:19 2014 +0000 |
tree | d61237da85dcfc00266f31bbb334958a9a063086 | |
parent | 3e47751528d546a6d969703e100e5c9de4d870be [diff] | |
parent | ee4a1fe6c2e4cd0155a7ccbe173d8754c57f1ae5 [diff] |
am ee4a1fe6: (-s ours) am 61283a85: (-s ours) Import translations. DO NOT MERGE * commit 'ee4a1fe6c2e4cd0155a7ccbe173d8754c57f1ae5': Import translations. DO NOT MERGE