tree 2f5ba24e686c0c5b5b4d5854c7e085850c5048bc
parent 110020229e0a31b060a329dfe55181f98a31e802
parent cd6e00c6d973af350f4bb0de5d85fed7e299d9e8
author Deepanshu Gupta <deepanshu@google.com> 1429204782 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429204782 +0000

am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev

* commit 'cd6e00c6d973af350f4bb0de5d85fed7e299d9e8':
  Update golden image for tests.
  Update to using LayoutlibCallback.
  Remove implementation of deprecated method.
  Add @empty support.