Skip to content
Commit d2e1149c authored by Patrice Arruda's avatar Patrice Arruda
Browse files

resolve merge conflicts of a3898089 to qt-dev-plus-aosp 

Bug: None
Test: Ran soong_ui.bash which compiles the soong_ui.
Change-Id: I0b8083e3e5ee69c8cbf17443fbc038ec7b5a0b10
parents 514fd602 a3898089
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