commit 3e87eafc7d1aef95801f1758bb78da8b2f960a75
author Jim Miller <jaggies@google.com> Thu Sep 20 22:01:35 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 20 22:01:35 2012 -0700
tree 592bf77d7d7e7bd16b47f2d42a89768816342ce0
parent d3724b951e1fdd48bd5accc29e5dff2102efdf3e
parent e5de9919b421b319aa0126aaae00573863d7a5bc

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

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 90d79a4..2381732 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28958,6 +28958,7 @@
     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);