commit b2c15661bfa91b3624839834b66fade1ffafc51a
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Aug 09 21:28:41 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 09 21:28:41 2018 +0000
tree 418a4086e5d4a2da16fb2b22a8fd956191d6cdd5
parent 05b8ecb682c99842ce989ead79bca006ddc6e01b
parent a8fc3a2542b9e636bd43a0397f8479ba4734604f

Merge "matrix (current): IR HAL specifies interface/instance"

contexthub/1.0/default/OWNERS

diff --git a/contexthub/1.0/default/OWNERS b/contexthub/1.0/default/OWNERS
index 49a3204..5373073 100644
--- a/contexthub/1.0/default/OWNERS
+++ b/contexthub/1.0/default/OWNERS
@@ -1,2 +1,4 @@
-ashutoshj@google.com
+aarossig@google.com
+arthuri@google.com
 bduddie@google.com
+bstack@google.com

contexthub/1.0/vts/functional/OWNERS

diff --git a/contexthub/1.0/vts/functional/OWNERS b/contexthub/1.0/vts/functional/OWNERS
index ad036b4..ee01441 100644
--- a/contexthub/1.0/vts/functional/OWNERS
+++ b/contexthub/1.0/vts/functional/OWNERS
@@ -1,6 +1,8 @@
 #Context Hub team
-ashutoshj@google.com
+aarossig@google.com
+arthuri@google.com
 bduddie@google.com
+bstack@google.com
 
 #VTS team
 yim@google.com

health/1.0/default/libhealthd/Android.bp

diff --git a/health/1.0/default/libhealthd/Android.bp b/health/1.0/default/libhealthd/Android.bp
index ce02e28..a90d50d 100644
--- a/health/1.0/default/libhealthd/Android.bp
+++ b/health/1.0/default/libhealthd/Android.bp
@@ -4,6 +4,7 @@
     srcs: ["healthd_board_default.cpp"],
     name: "libhealthd.default",
     vendor_available: true,
+    recovery_available: true,
     cflags: ["-Werror"],
     include_dirs: ["system/core/base/include"],
     header_libs: ["libhealthd_headers"],