| commit | d850ea573f036ad3a543d3e9318d9dc4fafadcaa | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:11:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:11:31 2015 +0000 |
| tree | 6bd3760013d24a0272654e11dd042d5948e37db4 | |
| parent | 2e438207f2d575e0091a583061c3eee9cf31575b [diff] | |
| parent | 37cbe67463cad6dfe0b7eafd51130d9d196adf61 [diff] |
am 37cbe674: (-s ours) am 2a9bd871: (-s ours) am cd64ce87: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '37cbe67463cad6dfe0b7eafd51130d9d196adf61': Import translations. DO NOT MERGE