OSDN Git Service

am 98ac6c79: resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Fri, 31 Jan 2014 15:06:17 +0000 (15:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 31 Jan 2014 15:06:17 +0000 (15:06 +0000)
commit54b100ceedfe29c3d8f389437c0abb91160923d0
tree1009727e9d12a2d5f319295bb61a0074deba24e6
parentcb6979acf9794a30ede4b888a078b728c913bb16
parent98ac6c79a430e62a886b3a8278694425b5906300
am 98ac6c79: resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aosp

* commit '98ac6c79a430e62a886b3a8278694425b5906300':
  Fix a few more delegate methods in layoutlib.