summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author kopriva <kopriva@google.com> 2018-09-13 18:51:53 -0700
committer android-build-merger <android-build-merger@google.com> 2018-09-13 18:51:53 -0700
commit16eb89477b60da5439d9666007a911d8279c0ad3 (patch)
treedfa2397a22c532247b1c6a26ed9323c94d31d81c
parentcebca6f778079153f6afe5eb232a3fd8107d7950 (diff)
parente71b05a211cf13a9962d672e3c85ce0b6c36d90d (diff)
Merge "docs: bug 37037879, typo" into pi-dev
am: e71b05a211 Change-Id: Iee76dc0a909c763e4a50ede80c9793cdf21c421a
-rw-r--r--media/java/android/media/AudioTrack.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java
index aaf7dd793060..62e58cab0772 100644
--- a/media/java/android/media/AudioTrack.java
+++ b/media/java/android/media/AudioTrack.java
@@ -1656,7 +1656,7 @@ public class AudioTrack extends PlayerBase
* @param timestamp a reference to a non-null AudioTimestamp instance allocated
* and owned by caller.
* @return true if a timestamp is available, or false if no timestamp is available.
- * If a timestamp if available,
+ * If a timestamp is available,
* the AudioTimestamp instance is filled in with a position in frame units, together
* with the estimated time when that frame was presented or is committed to
* be presented.