OSDN Git Service

Merge "LayoutLib: Use special view cookie for include-merge case." into honeycomb
authorXavier Ducrohet <xav@android.com>
Mon, 24 Jan 2011 22:31:28 +0000 (14:31 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 24 Jan 2011 22:31:28 +0000 (14:31 -0800)

Trivial merge