| commit | 10b941755f1a895e14863b2e6b3c8b613e899711 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Apr 16 11:22:27 2015 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Thu Apr 16 11:22:27 2015 -0700 |
| tree | 3ee4d78b45be325048a36f51606b92de0e31fdb5 | |
| parent | 27b363a9556a06106f2edb410ad2f6a5866282b7 [diff] | |
| parent | dcf2dac5f1b469f2a180b638d823bed1e8a62223 [diff] |
resolved conflicts for merge of dcf2dac5 to master
diff --git a/common/layoutlib_api/PREBUILT b/common/layoutlib_api/PREBUILT index 25ed352..4edf48c 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/+/e20d09d4d4bc49777e7240aebae8029471489036 +From: https://android.googlesource.com/platform/tools/base/+/8c32f7ef24436d394438f4cee86d889efa931654
diff --git a/common/layoutlib_api/layoutlib_api-prebuilt.jar b/common/layoutlib_api/layoutlib_api-prebuilt.jar index 274d11b..c7c6635 100644 --- a/common/layoutlib_api/layoutlib_api-prebuilt.jar +++ b/common/layoutlib_api/layoutlib_api-prebuilt.jar Binary files differ
diff --git a/common/layoutlib_api/layoutlib_api-sources.jar b/common/layoutlib_api/layoutlib_api-sources.jar index 59e2d0a..5d526ca 100644 --- a/common/layoutlib_api/layoutlib_api-sources.jar +++ b/common/layoutlib_api/layoutlib_api-sources.jar Binary files differ