Commit c0faa868 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger skipped] Merge "[automerger skipped] Merge "DO NOT MERGE: Remove... 

[automerger skipped] Merge "[automerger skipped] Merge "DO NOT MERGE: Remove test that depends on tz data" into lollipop-mr1-cts-dev am: 86251082 -s ours am: 270ab191 -s ours am skip reason: subject contains skip directive skipped: 92d2ef13 skipped: 246ac239

Change-Id: Ieccc01cd8d1b9bdf793a0b04e68d304a19345ebd
parents dfa9278c 246ac239
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