am e6a01f37: Merge "Fix build." into klp-dev

* commit 'e6a01f37934340c9fce9dcd8ee98b02d9d635af6':
  Fix build.

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java

@@ -134,4 +134,14 @@ public final class BridgeContentProvider implements IContentProvider {
         // TODO Auto-generated method stub
         return null;
     }
+
+    @Override
+    public Uri canonicalize(String callingPkg, Uri uri) throws RemoteException {
+        return null;
+    }
+
+    @Override
+    public Uri uncanonicalize(String callingPkg, Uri uri) throws RemoteException {
+        return null;
+    }
 }