Merge "Change size on first frame and change config cause crash."
authorJacky Chen <jackychen@google.com>
Fri, 25 Sep 2015 01:04:07 +0000 (01:04 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 25 Sep 2015 01:04:07 +0000 (01:04 +0000)

Trivial merge