commit | a5fe53fdcc13e1ead18a3a9e8bac1187c505f762 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:42:37 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:42:37 2014 +0000 |
tree | 0ab9f5066e7fe522540774e39282baffb608138f | |
parent | 5c7308d189fe33e8560f9e5cf109999497a1084d [diff] | |
parent | 2e800c017bc4400a360d002db5767a2142710186 [diff] |
am 2e800c01: (-s ours) am 70f7b1b6: (-s ours) am cb9247ce: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '2e800c017bc4400a360d002db5767a2142710186': Import translations. DO NOT MERGE