Merge "Remove intermediate src dir" am: 5491c611c0 am: c071011399 am: a21d2c740f am: f920bd44f0

Original change: https://android-review.googlesource.com/c/platform/tools/loganalysis/+/1663183

Change-Id: I241219bab1f4d8022da7427a53c436c1b947b71c

66 files changed, 3 insertions, 3 deletions

diff --git a/javatests/Android.bp b/javatests/Android.bp
index fae1c13..e89738a 100644
--- a/javatests/Android.bp
+++ b/javatests/Android.bp
@@ -21,7 +21,7 @@ java_test_host {
     defaults: ["tradefed_defaults"],
 
     // Only compile source java files in this lib.
-    srcs: ["src/**/*.java"],
+    srcs: ["com/**/*.java"],
 
     static_libs: [
         "loganalysis",
diff --git a/javatests/src/com/android/loganalysis/item/BatteryDischargeItemTest.java b/javatests/com/android/loganalysis/item/BatteryDischargeItemTest.java
index 5e27eb2..5e27eb2 100644
--- a/javatests/src/com/android/loganalysis/item/BatteryDischargeItemTest.java
+++ b/javatests/com/android/loganalysis/item/BatteryDischargeItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/BatteryUsageItemTest.java b/javatests/com/android/loganalysis/item/BatteryUsageItemTest.java
index b44a432..b44a432 100644
--- a/javatests/src/com/android/loganalysis/item/BatteryUsageItemTest.java
+++ b/javatests/com/android/loganalysis/item/BatteryUsageItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/DumpsysPackageStatsItemTest.java b/javatests/com/android/loganalysis/item/DumpsysPackageStatsItemTest.java
index dd60500..dd60500 100644
--- a/javatests/src/com/android/loganalysis/item/DumpsysPackageStatsItemTest.java
+++ b/javatests/com/android/loganalysis/item/DumpsysPackageStatsItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/DvmLockSampleItemTest.java b/javatests/com/android/loganalysis/item/DvmLockSampleItemTest.java
index 5d6054e..5d6054e 100644
--- a/javatests/src/com/android/loganalysis/item/DvmLockSampleItemTest.java
+++ b/javatests/com/android/loganalysis/item/DvmLockSampleItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/GenericItemTest.java b/javatests/com/android/loganalysis/item/GenericItemTest.java
index e9ea31f..e9ea31f 100644
--- a/javatests/src/com/android/loganalysis/item/GenericItemTest.java
+++ b/javatests/com/android/loganalysis/item/GenericItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/InterruptItemTest.java b/javatests/com/android/loganalysis/item/InterruptItemTest.java
index 9e9df61..9e9df61 100644
--- a/javatests/src/com/android/loganalysis/item/InterruptItemTest.java
+++ b/javatests/com/android/loganalysis/item/InterruptItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/LocationDumpsItemTest.java b/javatests/com/android/loganalysis/item/LocationDumpsItemTest.java
index a96bc0d..a96bc0d 100644
--- a/javatests/src/com/android/loganalysis/item/LocationDumpsItemTest.java
+++ b/javatests/com/android/loganalysis/item/LocationDumpsItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/MemInfoItemTest.java b/javatests/com/android/loganalysis/item/MemInfoItemTest.java
index 7f25fe3..3a8f307 100644
--- a/javatests/src/com/android/loganalysis/item/MemInfoItemTest.java
+++ b/javatests/com/android/loganalysis/item/MemInfoItemTest.java
@@ -30,8 +30,8 @@ public class MemInfoItemTest extends TestCase {
      */
     public void testToJson() throws JSONException {
         MemInfoItem item = new MemInfoItem();
-        item.put("foo", 123l);
-        item.put("bar", 456l);
+        item.put("foo", 123L);
+        item.put("bar", 456L);
         item.setText("foo: 123 kB\nbar: 456 kB");
 
         // Convert to JSON string and back again
diff --git a/javatests/src/com/android/loganalysis/item/MonkeyLogItemTest.java b/javatests/com/android/loganalysis/item/MonkeyLogItemTest.java
index cc2867c..cc2867c 100644
--- a/javatests/src/com/android/loganalysis/item/MonkeyLogItemTest.java
+++ b/javatests/com/android/loganalysis/item/MonkeyLogItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/ProcrankItemTest.java b/javatests/com/android/loganalysis/item/ProcrankItemTest.java
index 7f5d309..7f5d309 100644
--- a/javatests/src/com/android/loganalysis/item/ProcrankItemTest.java
+++ b/javatests/com/android/loganalysis/item/ProcrankItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/SmartMonkeyLogItemTest.java b/javatests/com/android/loganalysis/item/SmartMonkeyLogItemTest.java
index 4dd5597..4dd5597 100644
--- a/javatests/src/com/android/loganalysis/item/SmartMonkeyLogItemTest.java
+++ b/javatests/com/android/loganalysis/item/SmartMonkeyLogItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/SystemPropsItemTest.java b/javatests/com/android/loganalysis/item/SystemPropsItemTest.java
index b9b6675..b9b6675 100644
--- a/javatests/src/com/android/loganalysis/item/SystemPropsItemTest.java
+++ b/javatests/com/android/loganalysis/item/SystemPropsItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/TopItemTest.java b/javatests/com/android/loganalysis/item/TopItemTest.java
index 2df01d0..2df01d0 100644
--- a/javatests/src/com/android/loganalysis/item/TopItemTest.java
+++ b/javatests/com/android/loganalysis/item/TopItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/WakelockItemTest.java b/javatests/com/android/loganalysis/item/WakelockItemTest.java
index f570a7b..f570a7b 100644
--- a/javatests/src/com/android/loganalysis/item/WakelockItemTest.java
+++ b/javatests/com/android/loganalysis/item/WakelockItemTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/AbstractSectionParserTest.java b/javatests/com/android/loganalysis/parser/AbstractSectionParserTest.java
index 1092d0e..1092d0e 100644
--- a/javatests/src/com/android/loganalysis/parser/AbstractSectionParserTest.java
+++ b/javatests/com/android/loganalysis/parser/AbstractSectionParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/ActivityServiceParserTest.java b/javatests/com/android/loganalysis/parser/ActivityServiceParserTest.java
index 57aff9a..57aff9a 100644
--- a/javatests/src/com/android/loganalysis/parser/ActivityServiceParserTest.java
+++ b/javatests/com/android/loganalysis/parser/ActivityServiceParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/AnrParserTest.java b/javatests/com/android/loganalysis/parser/AnrParserTest.java
index e6afe80..e6afe80 100644
--- a/javatests/src/com/android/loganalysis/parser/AnrParserTest.java
+++ b/javatests/com/android/loganalysis/parser/AnrParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/BatteryDischargeStatsInfoParserTest.java b/javatests/com/android/loganalysis/parser/BatteryDischargeStatsInfoParserTest.java
index 691810c..691810c 100644
--- a/javatests/src/com/android/loganalysis/parser/BatteryDischargeStatsInfoParserTest.java
+++ b/javatests/com/android/loganalysis/parser/BatteryDischargeStatsInfoParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/BatteryStatsDetailedInfoParserTest.java b/javatests/com/android/loganalysis/parser/BatteryStatsDetailedInfoParserTest.java
index b176fa2..b176fa2 100644
--- a/javatests/src/com/android/loganalysis/parser/BatteryStatsDetailedInfoParserTest.java
+++ b/javatests/com/android/loganalysis/parser/BatteryStatsDetailedInfoParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/BatteryStatsSummaryInfoParserTest.java b/javatests/com/android/loganalysis/parser/BatteryStatsSummaryInfoParserTest.java
index c6ba381..c6ba381 100644
--- a/javatests/src/com/android/loganalysis/parser/BatteryStatsSummaryInfoParserTest.java
+++ b/javatests/com/android/loganalysis/parser/BatteryStatsSummaryInfoParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/BatteryUsageParserTest.java b/javatests/com/android/loganalysis/parser/BatteryUsageParserTest.java
index 20a9a2e..20a9a2e 100644
--- a/javatests/src/com/android/loganalysis/parser/BatteryUsageParserTest.java
+++ b/javatests/com/android/loganalysis/parser/BatteryUsageParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/BugreportParserTest.java b/javatests/com/android/loganalysis/parser/BugreportParserTest.java
index 5f3fc10..5f3fc10 100644
--- a/javatests/src/com/android/loganalysis/parser/BugreportParserTest.java
+++ b/javatests/com/android/loganalysis/parser/BugreportParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/CompactMemInfoParserTest.java b/javatests/com/android/loganalysis/parser/CompactMemInfoParserTest.java
index ed4b39b..ed4b39b 100644
--- a/javatests/src/com/android/loganalysis/parser/CompactMemInfoParserTest.java
+++ b/javatests/com/android/loganalysis/parser/CompactMemInfoParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/CpuInfoParserTest.java b/javatests/com/android/loganalysis/parser/CpuInfoParserTest.java
index 196f6a2..196f6a2 100644
--- a/javatests/src/com/android/loganalysis/parser/CpuInfoParserTest.java
+++ b/javatests/com/android/loganalysis/parser/CpuInfoParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/DmesgParserTest.java b/javatests/com/android/loganalysis/parser/DmesgParserTest.java
index e4ea7af..e4ea7af 100644
--- a/javatests/src/com/android/loganalysis/parser/DmesgParserTest.java
+++ b/javatests/com/android/loganalysis/parser/DmesgParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/DumpsysBatteryStatsParserTest.java b/javatests/com/android/loganalysis/parser/DumpsysBatteryStatsParserTest.java
index e96491a..e96491a 100644
--- a/javatests/src/com/android/loganalysis/parser/DumpsysBatteryStatsParserTest.java
+++ b/javatests/com/android/loganalysis/parser/DumpsysBatteryStatsParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/DumpsysPackageStatsParserTest.java b/javatests/com/android/loganalysis/parser/DumpsysPackageStatsParserTest.java
index ee15b78..ee15b78 100644
--- a/javatests/src/com/android/loganalysis/parser/DumpsysPackageStatsParserTest.java
+++ b/javatests/com/android/loganalysis/parser/DumpsysPackageStatsParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/DumpsysParserTest.java b/javatests/com/android/loganalysis/parser/DumpsysParserTest.java
index 020c724..020c724 100644
--- a/javatests/src/com/android/loganalysis/parser/DumpsysParserTest.java
+++ b/javatests/com/android/loganalysis/parser/DumpsysParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/DumpsysProcStatsParserTest.java b/javatests/com/android/loganalysis/parser/DumpsysProcStatsParserTest.java
index 27bb7a4..27bb7a4 100644
--- a/javatests/src/com/android/loganalysis/parser/DumpsysProcStatsParserTest.java
+++ b/javatests/com/android/loganalysis/parser/DumpsysProcStatsParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/DumpsysProcessMeminfoParserTest.java b/javatests/com/android/loganalysis/parser/DumpsysProcessMeminfoParserTest.java
index b7042d3..b7042d3 100644
--- a/javatests/src/com/android/loganalysis/parser/DumpsysProcessMeminfoParserTest.java
+++ b/javatests/com/android/loganalysis/parser/DumpsysProcessMeminfoParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/DumpsysWifiStatsParserTest.java b/javatests/com/android/loganalysis/parser/DumpsysWifiStatsParserTest.java
index f52e432..f52e432 100644
--- a/javatests/src/com/android/loganalysis/parser/DumpsysWifiStatsParserTest.java
+++ b/javatests/com/android/loganalysis/parser/DumpsysWifiStatsParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/DvmLockSampleParserTest.java b/javatests/com/android/loganalysis/parser/DvmLockSampleParserTest.java
index cb85999..cb85999 100644
--- a/javatests/src/com/android/loganalysis/parser/DvmLockSampleParserTest.java
+++ b/javatests/com/android/loganalysis/parser/DvmLockSampleParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/EventsLogParserTest.java b/javatests/com/android/loganalysis/parser/EventsLogParserTest.java
index 6956d16..6956d16 100644
--- a/javatests/src/com/android/loganalysis/parser/EventsLogParserTest.java
+++ b/javatests/com/android/loganalysis/parser/EventsLogParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/GfxInfoParserTest.java b/javatests/com/android/loganalysis/parser/GfxInfoParserTest.java
index fcd053b..fcd053b 100644
--- a/javatests/src/com/android/loganalysis/parser/GfxInfoParserTest.java
+++ b/javatests/com/android/loganalysis/parser/GfxInfoParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/InterruptParserTest.java b/javatests/com/android/loganalysis/parser/InterruptParserTest.java
index d45f3af..d45f3af 100644
--- a/javatests/src/com/android/loganalysis/parser/InterruptParserTest.java
+++ b/javatests/com/android/loganalysis/parser/InterruptParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/JavaCrashParserTest.java b/javatests/com/android/loganalysis/parser/JavaCrashParserTest.java
index a7d06b3..a7d06b3 100644
--- a/javatests/src/com/android/loganalysis/parser/JavaCrashParserTest.java
+++ b/javatests/com/android/loganalysis/parser/JavaCrashParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/KernelLogParserTest.java b/javatests/com/android/loganalysis/parser/KernelLogParserTest.java
index 159a90e..159a90e 100644
--- a/javatests/src/com/android/loganalysis/parser/KernelLogParserTest.java
+++ b/javatests/com/android/loganalysis/parser/KernelLogParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/LocationServiceParserTest.java b/javatests/com/android/loganalysis/parser/LocationServiceParserTest.java
index fc58e45..fc58e45 100644
--- a/javatests/src/com/android/loganalysis/parser/LocationServiceParserTest.java
+++ b/javatests/com/android/loganalysis/parser/LocationServiceParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/LogcatParserTest.java b/javatests/com/android/loganalysis/parser/LogcatParserTest.java
index 1d4f72c..1d4f72c 100644
--- a/javatests/src/com/android/loganalysis/parser/LogcatParserTest.java
+++ b/javatests/com/android/loganalysis/parser/LogcatParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/MemHealthParserTest.java b/javatests/com/android/loganalysis/parser/MemHealthParserTest.java
index 4659b76..4659b76 100644
--- a/javatests/src/com/android/loganalysis/parser/MemHealthParserTest.java
+++ b/javatests/com/android/loganalysis/parser/MemHealthParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/MemInfoParserTest.java b/javatests/com/android/loganalysis/parser/MemInfoParserTest.java
index ab41b33..ab41b33 100644
--- a/javatests/src/com/android/loganalysis/parser/MemInfoParserTest.java
+++ b/javatests/com/android/loganalysis/parser/MemInfoParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/MonkeyLogParserTest.java b/javatests/com/android/loganalysis/parser/MonkeyLogParserTest.java
index b7e867d..b7e867d 100644
--- a/javatests/src/com/android/loganalysis/parser/MonkeyLogParserTest.java
+++ b/javatests/com/android/loganalysis/parser/MonkeyLogParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/NativeCrashParserTest.java b/javatests/com/android/loganalysis/parser/NativeCrashParserTest.java
index 6c5cf98..6c5cf98 100644
--- a/javatests/src/com/android/loganalysis/parser/NativeCrashParserTest.java
+++ b/javatests/com/android/loganalysis/parser/NativeCrashParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/ProcessUsageParserTest.java b/javatests/com/android/loganalysis/parser/ProcessUsageParserTest.java
index bfba620..bfba620 100644
--- a/javatests/src/com/android/loganalysis/parser/ProcessUsageParserTest.java
+++ b/javatests/com/android/loganalysis/parser/ProcessUsageParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/ProcrankParserTest.java b/javatests/com/android/loganalysis/parser/ProcrankParserTest.java
index c47b750..c47b750 100644
--- a/javatests/src/com/android/loganalysis/parser/ProcrankParserTest.java
+++ b/javatests/com/android/loganalysis/parser/ProcrankParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/QtaguidParserTest.java b/javatests/com/android/loganalysis/parser/QtaguidParserTest.java
index f9442a6..f9442a6 100644
--- a/javatests/src/com/android/loganalysis/parser/QtaguidParserTest.java
+++ b/javatests/com/android/loganalysis/parser/QtaguidParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/SmartMonkeyLogParserTest.java b/javatests/com/android/loganalysis/parser/SmartMonkeyLogParserTest.java
index 1249f7c..1249f7c 100644
--- a/javatests/src/com/android/loganalysis/parser/SmartMonkeyLogParserTest.java
+++ b/javatests/com/android/loganalysis/parser/SmartMonkeyLogParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/SystemPropsParserTest.java b/javatests/com/android/loganalysis/parser/SystemPropsParserTest.java
index f6dc8a1..f6dc8a1 100644
--- a/javatests/src/com/android/loganalysis/parser/SystemPropsParserTest.java
+++ b/javatests/com/android/loganalysis/parser/SystemPropsParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/TimingsLogParserTest.java b/javatests/com/android/loganalysis/parser/TimingsLogParserTest.java
index 48881ea..48881ea 100644
--- a/javatests/src/com/android/loganalysis/parser/TimingsLogParserTest.java
+++ b/javatests/com/android/loganalysis/parser/TimingsLogParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/TopParserTest.java b/javatests/com/android/loganalysis/parser/TopParserTest.java
index 9b2253b..9b2253b 100644
--- a/javatests/src/com/android/loganalysis/parser/TopParserTest.java
+++ b/javatests/com/android/loganalysis/parser/TopParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/TraceFormatParserTest.java b/javatests/com/android/loganalysis/parser/TraceFormatParserTest.java
index 06ce9ec..06ce9ec 100644
--- a/javatests/src/com/android/loganalysis/parser/TraceFormatParserTest.java
+++ b/javatests/com/android/loganalysis/parser/TraceFormatParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/TracesParserTest.java b/javatests/com/android/loganalysis/parser/TracesParserTest.java
index c5046e3..c5046e3 100644
--- a/javatests/src/com/android/loganalysis/parser/TracesParserTest.java
+++ b/javatests/com/android/loganalysis/parser/TracesParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/WakelockParserTest.java b/javatests/com/android/loganalysis/parser/WakelockParserTest.java
index eff4ec8..eff4ec8 100644
--- a/javatests/src/com/android/loganalysis/parser/WakelockParserTest.java
+++ b/javatests/com/android/loganalysis/parser/WakelockParserTest.java
diff --git a/javatests/src/com/android/loganalysis/rule/InterruptRuleTest.java b/javatests/com/android/loganalysis/rule/InterruptRuleTest.java
index 7a08db0..7a08db0 100644
--- a/javatests/src/com/android/loganalysis/rule/InterruptRuleTest.java
+++ b/javatests/com/android/loganalysis/rule/InterruptRuleTest.java
diff --git a/javatests/src/com/android/loganalysis/rule/LocationUsageRuleTest.java b/javatests/com/android/loganalysis/rule/LocationUsageRuleTest.java
index 5dd7e9e..5dd7e9e 100644
--- a/javatests/src/com/android/loganalysis/rule/LocationUsageRuleTest.java
+++ b/javatests/com/android/loganalysis/rule/LocationUsageRuleTest.java
diff --git a/javatests/src/com/android/loganalysis/rule/ProcessUsageRuleTest.java b/javatests/com/android/loganalysis/rule/ProcessUsageRuleTest.java
index cc322dc..cc322dc 100644
--- a/javatests/src/com/android/loganalysis/rule/ProcessUsageRuleTest.java
+++ b/javatests/com/android/loganalysis/rule/ProcessUsageRuleTest.java
diff --git a/javatests/src/com/android/loganalysis/rule/WakelockRuleTest.java b/javatests/com/android/loganalysis/rule/WakelockRuleTest.java
index 6900c07..6900c07 100644
--- a/javatests/src/com/android/loganalysis/rule/WakelockRuleTest.java
+++ b/javatests/com/android/loganalysis/rule/WakelockRuleTest.java
diff --git a/javatests/src/com/android/loganalysis/rule/WifiStatsRuleTest.java b/javatests/com/android/loganalysis/rule/WifiStatsRuleTest.java
index 984ed20..984ed20 100644
--- a/javatests/src/com/android/loganalysis/rule/WifiStatsRuleTest.java
+++ b/javatests/com/android/loganalysis/rule/WifiStatsRuleTest.java
diff --git a/javatests/src/com/android/loganalysis/util/ArrayUtilTest.java b/javatests/com/android/loganalysis/util/ArrayUtilTest.java
index 98d85e6..98d85e6 100644
--- a/javatests/src/com/android/loganalysis/util/ArrayUtilTest.java
+++ b/javatests/com/android/loganalysis/util/ArrayUtilTest.java
diff --git a/javatests/src/com/android/loganalysis/util/LogPatternUtilTest.java b/javatests/com/android/loganalysis/util/LogPatternUtilTest.java
index 98226d4..98226d4 100644
--- a/javatests/src/com/android/loganalysis/util/LogPatternUtilTest.java
+++ b/javatests/com/android/loganalysis/util/LogPatternUtilTest.java
diff --git a/javatests/src/com/android/loganalysis/util/LogTailUtilTest.java b/javatests/com/android/loganalysis/util/LogTailUtilTest.java
index d7316c6..d7316c6 100644
--- a/javatests/src/com/android/loganalysis/util/LogTailUtilTest.java
+++ b/javatests/com/android/loganalysis/util/LogTailUtilTest.java
diff --git a/javatests/src/com/android/loganalysis/util/RegexTrieTest.java b/javatests/com/android/loganalysis/util/RegexTrieTest.java
index 4b689b6..4b689b6 100644
--- a/javatests/src/com/android/loganalysis/util/RegexTrieTest.java
+++ b/javatests/com/android/loganalysis/util/RegexTrieTest.java
diff --git a/javatests/src/com/android/loganalysis/util/config/ArgsOptionParserTest.java b/javatests/com/android/loganalysis/util/config/ArgsOptionParserTest.java
index 524cfa0..524cfa0 100644
--- a/javatests/src/com/android/loganalysis/util/config/ArgsOptionParserTest.java
+++ b/javatests/com/android/loganalysis/util/config/ArgsOptionParserTest.java
diff --git a/javatests/src/com/android/loganalysis/util/config/OptionSetterTest.java b/javatests/com/android/loganalysis/util/config/OptionSetterTest.java
index 308e895..308e895 100644
--- a/javatests/src/com/android/loganalysis/util/config/OptionSetterTest.java
+++ b/javatests/com/android/loganalysis/util/config/OptionSetterTest.java
diff --git a/javatests/src/com/android/loganalysis/util/config/OptionUpdateRuleTest.java b/javatests/com/android/loganalysis/util/config/OptionUpdateRuleTest.java
index 0e899ec..0e899ec 100644
--- a/javatests/src/com/android/loganalysis/util/config/OptionUpdateRuleTest.java
+++ b/javatests/com/android/loganalysis/util/config/OptionUpdateRuleTest.java