am c1ce1c99: am 951c6976: (-s ours) am fcdbc3cb: am 38f954c8: am e0537c1d: (-s ours) am c7f8e64c: am 1830a58f: am 5bb3414d: Fix a bug in Nine Patch library. [DO NOT MERGE]

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