Merge "Sim Status Present VTS" into pi-dev
diff --git a/automotive/vehicle/2.0/Android.bp b/automotive/vehicle/2.0/Android.bp
index 4b93008..91255d0 100644
--- a/automotive/vehicle/2.0/Android.bp
+++ b/automotive/vehicle/2.0/Android.bp
@@ -32,9 +32,9 @@
"SubscribeOptions",
"VehicleApPowerBootupReason",
"VehicleApPowerStateConfigFlag",
+ "VehicleApPowerStateReport",
"VehicleApPowerStateReq",
"VehicleApPowerStateReqIndex",
- "VehicleApPowerStateReport",
"VehicleApPowerStateShutdownParam",
"VehicleArea",
"VehicleAreaConfig",
diff --git a/camera/metadata/3.3/Android.bp b/camera/metadata/3.3/Android.bp
index 166c2ac..ad6f141 100644
--- a/camera/metadata/3.3/Android.bp
+++ b/camera/metadata/3.3/Android.bp
@@ -16,6 +16,7 @@
"CameraMetadataEnumAndroidControlAeMode",
"CameraMetadataEnumAndroidControlAfSceneChange",
"CameraMetadataEnumAndroidControlCaptureIntent",
+ "CameraMetadataEnumAndroidDistortionCorrectionMode",
"CameraMetadataEnumAndroidInfoSupportedHardwareLevel",
"CameraMetadataEnumAndroidLensPoseReference",
"CameraMetadataEnumAndroidLogicalMultiCameraSensorSyncType",
diff --git a/neuralnetworks/1.0/vts/OWNERS b/neuralnetworks/1.0/vts/OWNERS
index 59e7c28..87e322b 100644
--- a/neuralnetworks/1.0/vts/OWNERS
+++ b/neuralnetworks/1.0/vts/OWNERS
@@ -1,10 +1,10 @@
# Neuralnetworks team
butlermichael@google.com
dgross@google.com
-ijsung@google.com
jeanluc@google.com
miaowang@google.com
-yangni@google.com
+mikie@google.com
+pszczepaniak@google.com
# VTS team
yim@google.com
diff --git a/neuralnetworks/1.1/Android.bp b/neuralnetworks/1.1/Android.bp
index 81bcef3..24d8396 100644
--- a/neuralnetworks/1.1/Android.bp
+++ b/neuralnetworks/1.1/Android.bp
@@ -16,6 +16,7 @@
],
types: [
"Capabilities",
+ "ExecutionPreference",
"Model",
"Operation",
"OperationType",
diff --git a/neuralnetworks/1.1/vts/OWNERS b/neuralnetworks/1.1/vts/OWNERS
index 7f75ab3..87e322b 100644
--- a/neuralnetworks/1.1/vts/OWNERS
+++ b/neuralnetworks/1.1/vts/OWNERS
@@ -3,7 +3,8 @@
dgross@google.com
jeanluc@google.com
miaowang@google.com
-yangni@google.com
+mikie@google.com
+pszczepaniak@google.com
# VTS team
yim@google.com