tree 9416dd7928a6229e739c5069a205c35544f9e926
parent 034501d423a97e213f317480f0cd33dd65837203
parent 83cae922de4b60e719d29c85061cdc9de6808ced
author Brian C. Young <bcyoung@google.com> 1491933018 +0000
committer android-build-merger <android-build-merger@google.com> 1491933018 +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
am: 83cae922de

Change-Id: I86c8711edd2d412bd0230b314feb90378a5cf744