am 3e87eafc: Merge "Fix the build." into jb-mr1-dev

* commit '3e87eafc7d1aef95801f1758bb78da8b2f960a75': Fix the build.
2012-09-20 22:28:43 -07:00
parent e40950d78c 3e87eafc7d
commit 15fccd19a0
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);