Merge "Fix the build." into jb-mr1-dev

2012-09-20 22:01:35 -07:00
parent d3724b951e e5de9919b4
commit 3e87eafc7d
1 changed files with 1 additions and 0 deletions
--- a/api/current.txt
+++ b/api/current.txt
@@ -28958,6 +28958,7 @@ package android.widget {
    method public int describeContents();
    method public int getLayoutId();
    method public java.lang.String getPackage();
+    method public void mergeRemoteViews(android.widget.RemoteViews);
    method public boolean onLoadClass(java.lang.Class);
    method public void reapply(android.content.Context, android.view.View);
    method public void removeAllViews(int);