tree f4cc4a019c9a6ddfbb5ef4873df40264cdb13d0b
parent b05dbe320cc7cecb104c1b7ae38a57d5f3cecc89
parent d61777ec982f05a05e372d911704088e09f6c40f
author Paul Duffin <paulduffin@google.com> 1488375813 +0000
committer android-build-merger <android-build-merger@google.com> 1488375813 +0000

Merge changes from topic 'upgrade-expat-2.2.0'
am: d61777ec98

Change-Id: Ie17e4d110719ccd42446339fd21aaee3ee233a6a