commit fb749217282918b49c2e8f0fd0a46cf4ccd9ed33
author Shuo Qian <shuoq@google.com> Fri Apr 20 21:45:23 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 20 21:45:23 2018 +0000
tree 42645a96448b862b94e7a572ac6e9c5d531533e2
parent 579ef36ee80cd98f0b31127ff10684a1bf545f5f
parent 788eb8083059ff0dca686734ceebf942042c4893

Merge "Sim Status Present VTS" into pi-dev

automotive/vehicle/2.0/Android.bp

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",

camera/metadata/3.3/Android.bp

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",

neuralnetworks/1.0/vts/OWNERS

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

neuralnetworks/1.1/Android.bp

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",

neuralnetworks/1.1/vts/OWNERS

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