| commit | 2722960cbf968c700cde4c3ab3735646402f6ccc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 31 03:07:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 31 03:07:53 2015 +0000 |
| tree | 33eae59fc37484af35186ea65563b38d3522a734 | |
| parent | 62b5344c9b810545055a6377ec59ca82459db9b8 [diff] | |
| parent | 8e717629958b0f18833fc0de07edca181a14419b [diff] |
am 8e717629: (-s ours) am 9bd5d8a6: (-s ours) am 50265fc2: (-s ours) am 44718c4b: (-s ours) am bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '8e717629958b0f18833fc0de07edca181a14419b': Import translations. DO NOT MERGE