summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJinsuk Kim <jinsukkim@google.com>2015-01-20 23:47:44 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-20 23:47:44 +0000
commit00959a56e5869fcb8d05399656fddc9da54e86dc (patch)
tree60e1580c34cdd40aea4f095c53cc49b0f97c19a5 /core/java
parent6673d09a8a9bae0d5240d2fdd78b70b02e5af0a2 (diff)
parent375ae7ba3263ee8eceeb371b170e9181c801c612 (diff)
am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev
automerge: 375ae7b * commit '375ae7ba3263ee8eceeb371b170e9181c801c612': 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;