| commit | ef1cb855a84173417089715a595ecba6c6cde4ca | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:54:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:54:11 2015 +0000 |
| tree | 156318d1e7602a679e0bb7d9834512a17995ea14 | |
| parent | f72e120216d591f6ed1a9aa69d34009d69848108 [diff] | |
| parent | 7d5fb3a9430550a3ccf1ed5afd70dbf8cc81574a [diff] |
am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '7d5fb3a9430550a3ccf1ed5afd70dbf8cc81574a': Import translations. DO NOT MERGE