tree 4016eefb9d2c98b5438c9a8236d39de50fe9291f
parent b071a07da89a8736fa4fd757f9a6c6e990d0e858
parent 792f38ddd9e8d25b2c8bf0d67363dbfa56550636
author Deepanshu Gupta <deepanshu@google.com> 1394579778 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1394579778 -0700

am 792f38dd: Merge "Fix the delegate method signatures in LayoutLib"

* commit '792f38ddd9e8d25b2c8bf0d67363dbfa56550636':
  Fix the delegate method signatures in LayoutLib