am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev

automerge: 0684991

* commit '068499111c173fdd9869e7dbe5b9de857aca1c2d':
  Add Asset management support for fonts.

diff --cc tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
index 3441878,7c86f75..2f62b93
--- 1/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
--- 2/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
@@@ -16,8 -16,8 +16,9 @@@
  
  package com.android.layoutlib.bridge.android;
  
 +import android.os.IBinder;
  import com.android.annotations.Nullable;
+ import com.android.ide.common.rendering.api.AssetRepository;
  import com.android.ide.common.rendering.api.ILayoutPullParser;
  import com.android.ide.common.rendering.api.IProjectCallback;
  import com.android.ide.common.rendering.api.LayoutLog;