commit fc0b609a3ead8cb0b2e9452781b3a4670586d9c2
author Jean-Baptiste Queru <jbq@google.com> Mon Apr 30 11:22:11 2012 -0700
committer Jean-Baptiste Queru <jbq@google.com> Mon Apr 30 11:22:11 2012 -0700
tree 521d58ea55abd88d2b6941f6f3180e8661162d23
parent 438acfc43ab08daae92c39d0da0d345e72c20428

resolved conflicts for merge of ec8d4c9b to jb-dev-plus-aosp

Change-Id: Iaeecf77e219563f365a7739692204ea84f617cfc

common/layoutlib_api/PREBUILT

diff --git a/common/layoutlib_api/PREBUILT b/common/layoutlib_api/PREBUILT
index f0a3669..8ff00d7 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/sdk/layoutlib_api/
 
-From: http://android.git.kernel.org/?p=platform/sdk.git;a=commit;h=917373c1e375c76edba08a0936ddee7253dd5527
+From: http://android.git.kernel.org/?p=platform/sdk.git;a=commit;h=90256ae4056324ba5d8ef8fcd59de99f68b059a4

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 47a6384..1d06139 100644
--- a/common/layoutlib_api/layoutlib_api-prebuilt.jar
+++ b/common/layoutlib_api/layoutlib_api-prebuilt.jar
Binary files differ