am 28c76e3e: am 5db08e87: (-s ours) am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]

* commit '28c76e3e84c64bc68bb110a3924db826a78ae6e4':
  Fix a bug in Nine Patch library. [DO NOT MERGE]