summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2014-10-09 16:57:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-09 16:57:34 +0000
commit03be7ab52975a5bab0e0e86d25694c14b8030aa6 (patch)
tree2eebe541e532d90b8d8a7ac47259126f5c235cdc /api/current.txt
parente6411c76c44930cd893b78ea9f59f26a4a441881 (diff)
parent6167950b7a5a8b9f021e9656b42b9b48bfbcbf80 (diff)
downloadframeworks_base-03be7ab52975a5bab0e0e86d25694c14b8030aa6.zip
frameworks_base-03be7ab52975a5bab0e0e86d25694c14b8030aa6.tar.gz
frameworks_base-03be7ab52975a5bab0e0e86d25694c14b8030aa6.tar.bz2
am 6167950b: am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev
* commit '6167950b7a5a8b9f021e9656b42b9b48bfbcbf80': Remove UsageEvents#resetToStart() as it doesn't work
Diffstat (limited to 'api/current.txt')
-rw-r--r--api/current.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 0e01452..d4ed602 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5587,7 +5587,6 @@ package android.app.usage {
method public int describeContents();
method public boolean getNextEvent(android.app.usage.UsageEvents.Event);
method public boolean hasNextEvent();
- method public void resetToStart();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator CREATOR;
}