commit 32e10d0d0ab447cb8032fe116190c9410e125138
author The Android Automerger <android-build@google.com> Thu Feb 04 00:00:41 2016 -0800
committer The Android Automerger <android-build@google.com> Thu Feb 04 00:00:41 2016 -0800
tree 8296768e49a5a30e0887f843e19758396dd4e232
parent bee2e49a02c1056a5f9f89b0e42a99f2f6ea4ce8
parent 59017dac305a614d1908817cb2822b5638a7e3a1

merge in nyc-release history after reset to master

emu_test/config/boot_cfg.csv

diff --git a/emu_test/config/boot_cfg.csv b/emu_test/config/boot_cfg.csv
index 89180bd..6deb195 100644
--- a/emu_test/config/boot_cfg.csv
+++ b/emu_test/config/boot_cfg.csv
@@ -35,7 +35,7 @@
 ,,x86_64,Nexus 5,2048,yes,P,P,P,P,S,,P,P,P,P,P,P,P
 ,google_apis,armeabi-v7a,,,,,,P,,,,,,,,,,
 ,,x86,,,,P,P,P,P,P,P,P,P,P,P,P,P,P
-,,x86_64,,,,P,P,P,P,P,P,P,P,P,P,P,P,P
+,,x86_64,,,,P,P,P,P,S,P,P,P,P,P,P,P,P
 API 20,android-wear,armeabi-v7a,,,,,,P,,,,,,,,,,
 ,,x86,,,,,,P,,,,,,,,,,
 API 19,default,armeabi-v7a,,,,,,P,,,,,,,,,,