Merge "Remove unsafe methods" into lmp-dev
diff --git a/api/21.txt b/api/21.txt
index 529d213..7110cc0 100644
--- a/api/21.txt
+++ b/api/21.txt
@@ -27615,8 +27615,6 @@
     method public boolean hasTransientState();
     method public boolean hasWindowFocus();
     method public static android.view.View inflate(android.content.Context, int, android.view.ViewGroup);
-    method protected void initializeFadingEdge(android.content.res.TypedArray);
-    method protected void initializeScrollbars(android.content.res.TypedArray);
     method public void invalidate(android.graphics.Rect);
     method public void invalidate(int, int, int, int);
     method public void invalidate();