Skip to content
Commit 1ee31f0e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Remove dependency on ModuleTestUtils" am:... 

[automerger skipped] Merge "Remove dependency on ModuleTestUtils" am: b8fca94c am: 161a8830 -s ours

am skip reason: Change-Id Ic311aeaf4801c3b7c0dc5cd7a222cc304bba1335 with SHA-1 ccf4849b is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487756

Change-Id: I32263fb3331823dc62491035b8e818fc9375b0f0
parents 74b06048 161a8830
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment