commit c29a0ebf4c8c37110c1f2fe6db4dbc503eb5782a
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jan 05 01:14:34 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 05 01:14:34 2018 +0000
tree 0c5115f2ac4de820f5e6cae04d5a972701fd2b9f
parent 0a6cdc3bb11145f474be25b05e7595014436b821
parent a6eb3faeb5a9ea1b78f601a63d49fab73f369a72

Merge "Remove references to Keymaster::3.0 from Keymaster::4.0"

camera/metadata/3.3/types.hal

diff --git a/camera/metadata/3.3/types.hal b/camera/metadata/3.3/types.hal
index 7f96d9e..1d167ae 100644
--- a/camera/metadata/3.3/types.hal
+++ b/camera/metadata/3.3/types.hal
@@ -43,6 +43,15 @@
 
     ANDROID_CONTROL_END_3_3,
 
+    /** android.info.version [static, byte, public]
+     *
+     * <p>A short string for manufacturer version information about the camera device, such as
+     * ISP hardware, sensors, etc.</p>
+     */
+    ANDROID_INFO_VERSION = android.hardware.camera.metadata@3.2::CameraMetadataTag:ANDROID_INFO_END,
+
+    ANDROID_INFO_END_3_3,
+
 };
 
 /*