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