tree 9416dd7928a6229e739c5069a205c35544f9e926
parent 650f461627bbf9471d6e82c1a51314ed16d7c9e5
parent 2d0d39638a8b9ae58320b0caaca8be28ff2b6c02
author Brian C. Young <bcyoung@google.com> 1491932718 +0000
committer android-build-merger <android-build-merger@google.com> 1491932718 +0000

DO NOT MERGE: Apply upstream Chromium patch for encoding changes am: 22b8fccba6 am: 5a3fc56839 am: 7197e7faff  -s ours am: ea9f6e20ec  -s ours am: 5fbbf77aee am: 36d4345a58  -s ours am: abc430f974
am: 2d0d39638a

Change-Id: I02d678fb0cb657eda2dc55afadf91e00fe68b52a