commit | 42f41437750ce8a4fa2dec61cacec7acfbdb529a | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:15:42 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:15:42 2014 +0000 |
tree | 906ca8abbd6720bb780ea610f165731aa4ba4004 | |
parent | 8dab68b14768a595f15bfb4eac6668fdc7e8c835 [diff] | |
parent | 47555d2b1a3c490ead9e2093c7c91621aaf32d06 [diff] |
am f35f652a: (-s ours) am 1805b1a1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'f35f652a9b86cff1554895cc42d7ac5d83d7eb3b': Import translations. DO NOT MERGE