Merge "No longer need to explicitly specify ethernet upstream type" into oc-dr1-dev

am: db87829ff1

Change-Id: I3a28116f6b452812f1ef39ce11769479eab521f0
This commit is contained in:
Erik Kline
2017-06-22 04:56:08 +00:00
committed by android-build-merger

View File

@@ -137,7 +137,6 @@
<item>1</item>
<item>5</item>
<item>7</item>
<item>9</item>
</integer-array>
<!-- This string array should be overridden by the device to present a list of network