OSDN Git Service

am f978f16e: resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 11 Mar 2014 23:43:26 +0000 (23:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Mar 2014 23:43:26 +0000 (23:43 +0000)
commitc32a98b8cc09687a031ed969e39df593bf483459
tree6af1407518f2d72802e612757803c959acda5453
parent81686bd93c15f0129de27e1b2a2e025e0b4112b4
parentf978f16e50374681b0ade2d14a5e39cedaea6c2f
am f978f16e: resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp

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