OSDN Git Service

resolved conflicts for merge of 5476cfee to jb-mr1-dev
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 6 Aug 2014 21:41:02 +0000 (14:41 -0700)
committerDeepanshu Gupta <deepanshu@google.com>
Wed, 6 Aug 2014 21:41:02 +0000 (14:41 -0700)
commita232a68d4ccf2960350adff6af99a52bde2b021d
tree0426f2e5c60e22976a032f1a7c9ae47c202dc76e
parent9c48ab82084828087c47086f2379b4927ec057e2
parent5476cfee6b8b5e17a7fa72bb141ca95ef913a4f5
resolved conflicts for merge of 5476cfee to jb-mr1-dev

Change-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4
tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java