OSDN Git Service

am c32a98b8: am f978f16e: resolved conflicts for merge of c76345a3 to klp-modular...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 12 Mar 2014 19:56:58 +0000 (19:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Mar 2014 19:56:58 +0000 (19:56 +0000)
commitb552362bbc9001274f4022d8a494de6129f2723b
tree8104d9bec77182c517bd27e2b1e78dba70ae3c5d
parentf0379bdfb781a7d42121e88d5a528df8cd164b54
parentc32a98b8cc09687a031ed969e39df593bf483459
am c32a98b8: am f978f16e: resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp

* commit 'c32a98b8cc09687a031ed969e39df593bf483459':
  Fix the delegate method signatures in LayoutLib