commit | 7f1a13732e836fa431f889c58e4f3252f99a06bd | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sun Oct 26 22:48:24 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 26 22:48:24 2014 +0000 |
tree | 09de8a788aa2aacc32edb5010d772eadb00f3646 | |
parent | 6d94fe031e5f15af131abdd6dfba23f9b710d52d [diff] | |
parent | 097a867692552ddcb5dba74c01136eb2f6b79af5 [diff] |
am 097a8676: (-s ours) am ddacd6ac: (-s ours) Import translations. DO NOT MERGE * commit '097a867692552ddcb5dba74c01136eb2f6b79af5':