| commit | e39fe032c88846c2f5086f8b55ebad2d33e2d83e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Oct 10 05:41:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 10 05:41:02 2014 +0000 |
| tree | 3bc810777f4a8e048950ed644f42524a79a8e209 | |
| parent | 6603003794bc0f402e9f08e6e0461cac7d7c06a2 [diff] | |
| parent | 3853a21f019da6697e8b851ac9a98da5ac88a5ef [diff] |
am 3853a21f: (-s ours) am 52940c2b: (-s ours) am 437e5c9c: (-s ours) am db5b94d4: (-s ours) am f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '3853a21f019da6697e8b851ac9a98da5ac88a5ef': Import translations. DO NOT MERGE