Merge "Fix Build" into nyc-dev

am: 723a65a

* commit '723a65a51b651f458cc45dc089165431fc27c896':
  Fix Build

Change-Id: Iffaadb5a222694a9b7310abc72c644357d40393d
This commit is contained in:
Jason Monk
2016-04-05 13:54:38 +00:00
committed by android-build-merger

View File

@@ -29767,7 +29767,6 @@ package android.preference {
method protected void onClick();
method protected android.view.View onCreateView(android.view.ViewGroup);
method public void onDependencyChanged(android.preference.Preference, boolean);
method protected void onDetachedFromActivity();
method protected java.lang.Object onGetDefaultValue(android.content.res.TypedArray, int);
method public void onParentChanged(android.preference.Preference, boolean);
method protected void onPrepareForRemoval();