commit 25e81f36838c64ac45a83f677095eb1dd2755db4
author The Android Automerger <android-build@android.com> Thu Oct 18 07:00:11 2012 -0700
committer The Android Automerger <android-build@android.com> Thu Oct 18 07:00:11 2012 -0700
tree 53cfab5dd8ce23d9bb07c28c674360466c217908
parent 853b881c9583f8683ea1bf948709c036ac61f928
parent 6342befcdc1eaa66959389cd46bf9881063999b1

merge in jb-mr1-release history after reset to jb-mr1-dev

common/layoutlib_api/PREBUILT

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

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