Merge a109773a from master. do not merge.

Update layoutlib api level to 6.

This will make earlier ADT versions force the user to update.

Change-Id: I20158fb894ba0a88d981301a003e7f09719bab43

diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/Bridge.java b/layoutlib_api/src/com/android/ide/common/rendering/api/Bridge.java
index ad2dd38..e21d039 100644 (file)
--- a/layoutlib_api/src/com/android/ide/common/rendering/api/Bridge.java
+++ b/layoutlib_api/src/com/android/ide/common/rendering/api/Bridge.java
@@ -32,7 +32,7 @@ import java.util.Map;
  */
 public abstract class Bridge {
 
-    public final static int API_CURRENT = 5;
+    public final static int API_CURRENT = 6;
 
     /**
      * Returns the API level of the layout library.