merge in nyc-release history after reset to nyc-dev
diff --git a/src/com/android/tradefed/targetprep/CpuThrottlingWaiter.java b/src/com/android/tradefed/targetprep/CpuThrottlingWaiter.java
index 06ba6c3..a9aae9d 100644
--- a/src/com/android/tradefed/targetprep/CpuThrottlingWaiter.java
+++ b/src/com/android/tradefed/targetprep/CpuThrottlingWaiter.java
@@ -116,7 +116,7 @@
protected Map<String, String> getCpuMaxFreqs(ITestDevice device)
throws DeviceNotAvailableException {
Map<String, String> ret = new HashMap<>();
- String result = device.executeShellCommand("ls -d /sys/devices/system/cpu/cpu*/cpufreq");
+ String result = device.executeShellCommand("ls -1 -d /sys/devices/system/cpu/cpu*/cpufreq");
String[] lines = result.split("\r?\n");
List<String> cpuPaths = new ArrayList<>();
for (String line : lines) {