tree f4cc4a019c9a6ddfbb5ef4873df40264cdb13d0b
parent b05dbe320cc7cecb104c1b7ae38a57d5f3cecc89
parent 69996bb2857e52345c744638f296e8fb4dd97eeb
author Paul Duffin <paulduffin@google.com> 1488375565 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1488375565 +0000

Merge changes from topic 'upgrade-expat-2.2.0'

* changes:
  Fix cast from pointer to integer of different size
  Reverted change to switch from COMPILED_FROM_DSP to WIN32
  Upgrade to expat 2.2.0