Merge "Fix typos in previous bugfixes." into lmp-dev

tools/layoutlib/bridge/src/android/widget/TimePickerSpinnerDelegate_Delegate.java

@@ -30,7 +30,7 @@ public class TimePickerSpinnerDelegate_Delegate {
     private static final int PM = 1;
 
     @LayoutlibDelegate
-    static int getAmOrPmKeyCode(int amOrPm) {
+    static int getAmOrPmKeyCode(TimePickerSpinnerDelegate tpsd, int amOrPm) {
         // We don't care about locales here.
         if (amOrPm == AM) {
             return KeyEvent.KEYCODE_A;

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

@@ -482,7 +482,7 @@ public final class BridgeContext extends Context {
             // In some cases, style may not be a dynamic id, so we do a full search.
             ResourceReference ref = resolveId(resid);
             if (ref != null) {
-                mRenderResources.getStyle(ref.getName(), ref.isFramework());
+                style = mRenderResources.getStyle(ref.getName(), ref.isFramework());
             }
         }