am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"

* commit '33fa6a0b3bde25daabf330d152e9d400db42970e':