Merge "Revert "Fixed order and cleaned up unused vars"" am: 2ff7b2dc42 am: 44da0120b8
am: 5cf651f446

Bug: 78231475
Change-Id: I7abd1c20bb8643a1287271d367383d80a650ab60
(cherry picked from commit 8920ffbab029bbdc91dd898d946264c6689e3858)
1 file changed
tree: a0530f81727996f7f2733edeab165966a10ace55
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg