Merge branch 'master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Tue, 2 Apr 2013 21:54:44 +0000 (14:54 -0700)
committerJohn Koleszar <jkoleszar@google.com>
Tue, 2 Apr 2013 21:54:44 +0000 (14:54 -0700)
commit42db454c7f99ad97d834edb231b94172d4f29b97
tree2824f813e12549dd9a6f68086a682238c26886dc
parent49bc402a9479636d6b75693e421473161de98db4
parent3db60c8c6c6081864e50a162e2236ba03e21828b
Merge branch 'master' into experimental

Conflicts:
vp9/vp9_common.mk

Change-Id: I2cd5ab47dc31c4210cefc23a282102123d5e2221
vp9/common/x86/vp9_loopfilter_intrin_sse2.c
vp9/vp9_common.mk