Commit 2036ecff authored by Takeshi Nishimura's avatar Takeshi Nishimura Committed by android-build-merger
Browse files

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

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

Change-Id: I8ac94f623232690d07c25ce9f23c63880258c728
parents 8456a04b d9a17bef
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