-
rouslan@chromium.org authored
Fix the merge conflict and reland http://crrev.com/282726, which was reverted in http://crrev.com/282732. TBR=estade@chromium.org,thestig@chromium.org,groby@chromium.org BUG=389918 Review URL: https://codereview.chromium.org/389733002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282842 0039d316-1c4b-4281-b951-d872f2087c98
dfafc804
