tree 5ca6db0e7f16f4db836d9251f7574355c36a789b
parent 19d7d4fa179892a8f3d7cf389f74bea9e01ebfc7
parent 7ed0d63df8b2e645f9400885e1025829595d7c37
author Treehugger Robot <treehugger-gerrit@google.com> 1639085127 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639085127 +0000

Merge "Update ImageStats test to use JSON file instead of txt file." am: 7ed0d63df8

Original change: https://android-review.googlesource.com/c/platform/tools/tradefederation/contrib/+/1915699

Change-Id: I2f09092fd8efb4eafb23f04644a41bbc680a0c35