Merge "Trap request to display non-existant frame"
authorAdrian Grange <agrange@google.com>
Tue, 25 Feb 2014 16:48:14 +0000 (08:48 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 25 Feb 2014 16:48:14 +0000 (08:48 -0800)

Trivial merge