| commit | 96d0e0194d43d3cdf04f39d5791160a91e0734bd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:53:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:53:31 2015 +0000 |
| tree | 1c344e3a6deefc5bf4fd3fcc7a504f7b1491c5f8 | |
| parent | 6b6db80ca0eb058c8af0ff98c6b89022829d5cc4 [diff] | |
| parent | 7d5fb3a9430550a3ccf1ed5afd70dbf8cc81574a [diff] |
am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '7d5fb3a9430550a3ccf1ed5afd70dbf8cc81574a': Import translations. DO NOT MERGE