diff options
| author |  Googler <noreply@google.com> | 2016-04-15 20:31:51 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-04-18 10:43:18 +0000 |
| commit | ea81a7037f761c10516cfa6ef1eeee7e4bcc7d07 (patch) | |
| tree | 7b905e84f0366d954e8dd09bafa3f9fd28a79989 | |
| parent | f29f3ea116e4cb082311fa257ba17e0a94dbbcc5 (diff) | |
Allow for non-ascii values for android:versionName
--
MOS_MIGRATED_REVID=119986133
| -rw-r--r-- | tools/android/merge_manifests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/android/merge_manifests.py b/tools/android/merge_manifests.py index 6c3af21046..c51eb57e2b 100644 --- a/tools/android/merge_manifests.py +++ b/tools/android/merge_manifests.py @@ -418,7 +418,7 @@ def main(): for line in merged_manifests.split('\n'): if not line.strip(): continue - out_file.write(line + '\n') + out_file.write(line.encode('utf8') + '\n') if __name__ == '__main__': FLAGS(sys.argv) |