OSDN Git Service

resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 01:57:34 +0000 (18:57 -0700)
committerDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 01:57:34 +0000 (18:57 -0700)
commit8a70bcef5a724906e3c35c58cb2266ee9c9e1b78
treef2cb1b765259a60932381baaab6da5436d03b237
parent40fea8b1bf689933e63941b5fa5e3379f82c88b5
parent5a7b3b65b691edbdb855eb6154b8b30f5700acbb
resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp

Change-Id: I6bafdb9c6a8dfc6f55a4d9adf67f447661137eb8
tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java