am c016f668: Merge "Fix Broken RemoteViewsTest" into gingerbread

* commit 'c016f66855664dd62f4abdc2dd2af08a5dd27d76':
  Fix Broken RemoteViewsTest