summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2014-10-09 16:46:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-09 16:46:14 +0000
commit6167950b7a5a8b9f021e9656b42b9b48bfbcbf80 (patch)
treeb1e8d71698f7e803daddb03c57b39d4c509ff478 /api/current.txt
parente73bb6e059dbd073b09246471b332b6b0e72f191 (diff)
parent59d208ddc1c5c51ae4d4f19ffbaf7685e534fe7f (diff)
downloadframeworks_base-6167950b7a5a8b9f021e9656b42b9b48bfbcbf80.zip
frameworks_base-6167950b7a5a8b9f021e9656b42b9b48bfbcbf80.tar.gz
frameworks_base-6167950b7a5a8b9f021e9656b42b9b48bfbcbf80.tar.bz2
am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev
* commit '59d208ddc1c5c51ae4d4f19ffbaf7685e534fe7f': 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 e2a5145..738e40e 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;
}