tree d10bfb60daa26a6b22f817a5ef86143cd56fd142
parent 0750f2baa21519a516aa2600f2ae027c29654789
parent e0628134ab8c5f997d43cc6d8ed79fdea5e815f6
author Deepanshu Gupta <deepanshu@google.com> 1396581601 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396581601 +0000

am e0628134: (-s ours) am 53ccdf18: am ef5caff8: am c0086ba5: am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev

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