am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5
automerge: 5d7bd13

* commit '5d7bd13fc88d066d4c27a2459f3e3a58a1f4dec2':