tree 8488eba50ef9525d16405ab7cad8f638f5a845da
parent 07154b021617794bf37eed3e020ca39035155587
author Yaowu Xu <yaowu@google.com> 1443480946 -0700
committer Yaowu Xu <yaowu@google.com> 1443568652 -0700

Merged branch 'master' into nextgenv2

Resolved Conflicts in the following files:
        configure
        vp10/common/idct.c
        vp10/encoder/dct.c
        vp10/encoder/encodemb.c
        vp10/encoder/rdopt.c

Change-Id: I4cb3986b0b80de65c722ca29d53a0a57f5a94316