commit 78f92eef03a3cb1859d35d41c848ef2e24818d76
author Dan Sandler <dsandler@android.com> Fri Jul 18 13:49:59 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 17 19:20:15 2014 +0000
tree 4e27cb58e26bdc6032b90997dce229aab8673b78
parent d811af223ea4064669ad219f78aa7f57d6bb5bce
parent 4d75c079f35d85b687d8349e5e2940447d01198e

Merge "Shrink user profile bitmaps to 48dp^2." into lmp-dev

media/java/android/media/tv/TvInputHardwareInfo.java

diff --git a/media/java/android/media/tv/TvInputHardwareInfo.java b/media/java/android/media/tv/TvInputHardwareInfo.java
index e5f9889..d7d3cf2 100644
--- a/media/java/android/media/tv/TvInputHardwareInfo.java
+++ b/media/java/android/media/tv/TvInputHardwareInfo.java
@@ -16,6 +16,7 @@
 
 package android.media.tv;
 
+import android.annotation.SystemApi;
 import android.media.AudioManager;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -27,6 +28,7 @@
  *
  * @hide
  */
+@SystemApi
 public final class TvInputHardwareInfo implements Parcelable {
     static final String TAG = "TvInputHardwareInfo";