OSDN Git Service

(root) / android-x86 / sdk.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e3749f6) | patch
Fix auto-merge
authorTor Norbye <tnorbye@google.com>
Thu, 19 May 2011 15:22:04 +0000 (08:22 -0700)
committerTor Norbye <tnorbye@google.com>
Thu, 19 May 2011 15:22:04 +0000 (08:22 -0700)
commita87491173c4d981359a338c361d83b986ef76a4f
tree03cc4c5c7ecd58234f3df59f7be470399830ddddtree | snapshot
parente3749f65533eb5566e73ff386e3978c67c7c5920commit | diff
Fix auto-merge

A change that was cherrypicked from the external master into the
tools-r11 branch was automerged back into the external master in such
a way that a method and a field got duplicated. This CL fixes the
merge.

Change-Id: I5b05c8a9477b4afb669efd1904c1415925d25307
eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/descriptors/LayoutDescriptors.java diff | blob | history
sdk
About OSDN
Find Software
Develop Software
Help