Commit 26178a9c authored by Takeshi Nishimura's avatar Takeshi Nishimura Committed by android-build-merger
Browse files

Merge "[automerger skipped] Merge "DO NOT MERGE Change... 

Merge "[automerger skipped] Merge "DO NOT MERGE Change TIME_SPENT_IN_FOREGROUND for BatteryStatsValidationTest" into oreo-mr1-cts-dev am: d9a17bef -s ours
am: cb5395d4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie495db198a42f12143262db84de8104ad949afd5
parents 9f2741fb cb5395d4
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment