am 0437302: Merge "Fix the build" into jb-mr1-dev

* commit '0437302f164f3eb1ba6a359ef5b3cd857facbbe4':
  Fix the build

Author: Fabrice Di Meglio

api/current.txt

@@ -25661,6 +25661,7 @@ package android.view {
     method public void requestDisallowInterceptTouchEvent(boolean);
     method public boolean requestSendAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);
     method public void requestTransparentRegion(android.view.View);
+    method public void resolveLayoutParams();
     method public void scheduleLayoutAnimation();
     method public void setAddStatesFromChildren(boolean);
     method public void setAlwaysDrawnWithCacheEnabled(boolean);