OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e3ced5b) | patch
Fix a bad merge
authorNeil Fuller <nfuller@google.com>
Fri, 19 Feb 2016 16:50:14 +0000 (16:50 +0000)
committerNeil Fuller <nfuller@google.com>
Fri, 19 Feb 2016 16:50:14 +0000 (16:50 +0000)
commit6b6d8426fe16191b8ef9187c27e7b2f7540a4197
treea5449370895220ac46ef3135638904c65b3be1b5tree | snapshot
parente3ced5b64276ae1bdf949d569c542aa760021f2dcommit | diff
Fix a bad merge

There was a bad interaction between
commits 6777f54fa44341dd4b23456c97d97c6e4ffe915f
and 23e47f5621271db9b84f53f15a3e3d81d8b8b48d.

Change-Id: Ic408f8b4859d83d89c612748ee6e772b57830d96
tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateMethodAdapter.java diff | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help