| commit | 32764d0c455561c019ba6cbfe898b954d9621f23 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 29 14:47:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 14:47:40 2015 +0000 |
| tree | 15d05cc8baacd8d571c05f2ea4e6811f16ce14fd | |
| parent | bf83b39739d4d0a991d287b7d0d23eb670333aa8 [diff] | |
| parent | 32ceb174c615591a7fe5fd847da6156d29fa6472 [diff] |
am 32ceb174: (-s ours) am b12e06a4: (-s ours) am 57327c52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '32ceb174c615591a7fe5fd847da6156d29fa6472': Import translations. DO NOT MERGE