Snap for 8426163 from 0712e2a442364af77a0b1dda0adf922d1d1447bc to mainline-tzdata2-release

Change-Id: I8c3be9b5e7bf491232c557218c86eb1dac5dd085
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..fbe1d05
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,19 @@
+//
+// Copyright (C) 2017 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+vts_config {
+    name: "VtsNbu",
+}
diff --git a/AndroidTest.xml b/AndroidTest.xml
new file mode 100644
index 0000000..c648cf9
--- /dev/null
+++ b/AndroidTest.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<configuration description="Config for VTS Next Billion User test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-p2p" />
+    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
+        <option name="dep-module" value="mobly==1.7.1" />
+    </multi_target_preparer>
+
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsNbuBle" />
+        <option name="test-timeout" value="30m" />
+        <option name="runtime-hint" value="10m" />
+        <option name="mobly-test-module" value="vts.testcases.nbu.src.ble_test.BleTest" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsNbuBluetooth" />
+        <option name="test-timeout" value="30m" />
+        <option name="runtime-hint" value="10m" />
+        <option name="mobly-test-module" value="vts.testcases.nbu.src.bluetooth_test.BluetoothTest" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsNbuLocalHotspot" />
+        <option name="test-timeout" value="30m" />
+        <option name="runtime-hint" value="10m" />
+        <option name="mobly-test-module" value="vts.testcases.nbu.src.local_hotspot_test.LocalHotspotTest" />
+    </test>
+
+    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+        <option name="test-module-name" value="VtsNbuWifiDirect" />
+        <option name="test-timeout" value="30m" />
+        <option name="runtime-hint" value="10m" />
+        <option name="mobly-test-module" value="vts.testcases.nbu.src.wifi_direct_test.WifiDirectTest" />
+    </test>
+</configuration>