tree 9454e9e267af251e4b6f8f498f2af15d5403a0d7
parent 0d515b29b14a34a57ae9d9ca6fcdd816afc0d360
parent 75c9abd28f798413d115f21cf721a5b229b1df0a
author Yaowu Xu <yaowu@google.com> 1472769198 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1472769199 +0000

Merge ".gitignore: corrent entries from vpx to aom" into nextgenv2