OSDN Git Service

Fix merge error
authorTor Norbye <tnorbye@google.com>
Mon, 11 Jul 2011 22:25:24 +0000 (15:25 -0700)
committerTor Norbye <tnorbye@google.com>
Mon, 11 Jul 2011 22:25:24 +0000 (15:25 -0700)
commit35e67b6d77edc59d1a108ed1da60f2b69e4416de
tree7914e8ee11ffb85bf183d588e390abca48751b3d
parent90c7e326d007dd645106dc1269f0713bb572ce3a
Fix merge error

Change-Id: Iac2dcc3a504ab2dbc500bcd882d61b460879c7eb
eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LayoutConstants.java