commit 06e35c23f02928b237d5f7cf1f980c5832aa2f93
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 16 19:46:37 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 16 19:46:37 2018 +0000
tree a8f2738859cb6bd8dd4136071c1ceb30686fa728
parent 6991ff51d41f7ec078214e5d922e4194b1c8aaa6
parent 1172dc9f80873188075fd65ea05d70db105e9f96

Merge "bootstat: alias underline to space in bit error rate handling"

libmemunreachable/Android.bp

diff --git a/libmemunreachable/Android.bp b/libmemunreachable/Android.bp
index caca377..f872d0f 100644
--- a/libmemunreachable/Android.bp
+++ b/libmemunreachable/Android.bp
@@ -88,7 +88,6 @@
 cc_test {
     name: "memunreachable_binder_test",
     defaults: ["libmemunreachable_defaults"],
-    test_suites: ["vts"],
     srcs: [
         "tests/Binder_test.cpp",
     ],

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index a213ffb..1462570 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -573,6 +573,9 @@
     hostname localhost
     domainname localdomain
 
+    # IPsec SA default expiration length
+    write /proc/sys/net/core/xfrm_acq_expires 3600
+
     # Memory management.  Basic kernel parameters, and allow the high
     # level system server to be able to adjust the kernel OOM driver
     # parameters to match how it is managing things.