Commit 61dd017b 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: 2036ecff -s ours
am skip reason: subject contains skip directive

Change-Id: I87e3d9a23e07d20c59406486a6744211d5ded5fb
parents 9a0808a8 2036ecff
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