commit a551639498b21fdbd592e1c14b2abd07765f9823
author Deepanshu Gupta <deepanshu@google.com> Tue Feb 17 16:33:04 2015 -0800
committer Deepanshu Gupta <deepanshu@google.com> Tue Feb 17 16:33:04 2015 -0800
tree a9407bd29d8303184a8cea5c37f284c746d30fd0
parent b0e8f47863824ded243ccd3f9d1a12355ae115a3
parent 2b06c3b54af2de8f137d53eb08cbdfb53eb6a028

resolved conflicts for merge of 2b06c3b5 to master

common/layoutlib_api/PREBUILT

diff --git a/common/layoutlib_api/PREBUILT b/common/layoutlib_api/PREBUILT
index 3c64fa4..d6f1aa0 100644
--- a/common/layoutlib_api/PREBUILT
+++ b/common/layoutlib_api/PREBUILT
@@ -1,4 +1,4 @@
 The object in this prebuilt directory can be rebuilt from
 	platform/tools/base/layoutlib_api/
 
-From: https://android.googlesource.com/platform/tools/base/+/b2ac501ecee936922cd623e4e409e749775784d5
+From: https://android.googlesource.com/platform/tools/base/+/531195e641479c4203ebbfed21d9c1693e44a1f9

common/layoutlib_api/layoutlib_api-prebuilt.jar

diff --git a/common/layoutlib_api/layoutlib_api-prebuilt.jar b/common/layoutlib_api/layoutlib_api-prebuilt.jar
index 4a8f929..3cd2e81 100644
--- a/common/layoutlib_api/layoutlib_api-prebuilt.jar
+++ b/common/layoutlib_api/layoutlib_api-prebuilt.jar
Binary files differ

common/layoutlib_api/layoutlib_api-sources.jar

diff --git a/common/layoutlib_api/layoutlib_api-sources.jar b/common/layoutlib_api/layoutlib_api-sources.jar
new file mode 100644
index 0000000..9182170
--- /dev/null
+++ b/common/layoutlib_api/layoutlib_api-sources.jar
Binary files differ