tree 027dd5b8837cb80ba3cc24788a0bd8b1c1666587
parent d2cb4361c732dcddc98659415f37be45982e20c3
author JF Bastien <jfb@chromium.org> 1416592937 -0800
committer JF Bastien <jfb@chromium.org> 1416592937 -0800

Merge remote-tracking branch 'origin/merge_35'

R=stichnot@chromium.org
BUG= https://code.google.com/p/nativeclient/issues/detail?id=3930

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