commit | d3ec27cc96d72ec2132646441a648ec23748e302 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Sep 23 17:42:34 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 17:42:34 2015 +0000 |
tree | e2672ca547a68f4d9dff978e68de3e2fafbbc64e | |
parent | ca5a0b560541117ac94423f877a4ff476499b38b [diff] | |
parent | daa866fb7beecd791ab867eb5d02bd82ca4dc740 [diff] |
am 981c592d: (-s ours) am 18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '981c592d2a6eaf3e43a8cab274fbcb4c58b99eab': Import translations. DO NOT MERGE