summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJinsuk Kim <jinsukkim@google.com>2015-01-20 23:54:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-20 23:54:47 +0000
commit0ae35a8a26be0c2be53e5d149aead4d5d32ad07f (patch)
treed8cae5e8e1acc62ad7ac2b44c56802b7142d6fa9 /core/java
parent0a5be32d7a70d510fcdda030bdb34e31ec22ebe0 (diff)
parent00959a56e5869fcb8d05399656fddc9da54e86dc (diff)
am 00959a56: am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev automerge: 375ae7b
* commit '00959a56e5869fcb8d05399656fddc9da54e86dc': Mark TimeUnit as @SystemApi
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/hardware/hdmi/HdmiTimerRecordSources.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/hardware/hdmi/HdmiTimerRecordSources.java b/core/java/android/hardware/hdmi/HdmiTimerRecordSources.java
index bf97375c8f95..6fe13ca8e375 100644
--- a/core/java/android/hardware/hdmi/HdmiTimerRecordSources.java
+++ b/core/java/android/hardware/hdmi/HdmiTimerRecordSources.java
@@ -183,7 +183,12 @@ public class HdmiTimerRecordSources {
}
}
- private static class TimeUnit {
+ /**
+ * Base class for time-related information.
+ * @hide
+ */
+ @SystemApi
+ /* package */ static class TimeUnit {
/* package */ final int mHour;
/* package */ final int mMinute;