tree 6ae8ceccf274f54c93d200bfa3a56f2f5acb54c8
parent d016cb3f1d31fefd8a207d19b38940d958c4d088
parent ed032d891c25f7fa39f9f454cc51936a805531c8
author Brian C. Young <bcyoung@google.com> 1491934820 +0000
committer android-build-merger <android-build-merger@google.com> 1491934820 +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 am: d564a70805  -s ours am: 044380da74 am: 62908c2230
am: ed032d891c

Change-Id: Id4b6413f758c4bc121c1687306484c5dc2dc359d