tree c8305ef66d7ecad9cad2c1054c71da53bd8e89a6
parent 6f93de501d591a6c2980d38a1ff0a6b5e434b80a
author Tom Sepez <tsepez@chromium.org> 1434747388 -0700
committer Tom Sepez <tsepez@chromium.org> 1434747388 -0700

Merge to XF: Disintermediation.

(cherry picked from commit 012ada613a1462f109eb59790f8e5ee91aacdb7e)
Review URL: https://codereview.chromium.org/1199553002.

TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1197893002.