tree 5b4e170c75482954bc36146eb70b3cab12419882
parent ae18ad58c25094a4c6ba19e1acb4b32ca3a27541
parent 5cda553be3d08113605831a7415a89cb5b362ab2
author Alex Klyubin <klyubin@google.com> 1497647032 +0000
committer android-build-merger <android-build-merger@google.com> 1497647032 +0000

CR, LF, and NUL are not permitted in ZIP entry names am: 27fbfa6017
am: 5cda553be3

Change-Id: If98bd6ac09ee287d2d018b114610b6ff511f5a3c