Skip to content
Commit 7cd99c47 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

resolve merge conflicts of 132a5027 to rvc-qpr-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I6cbbb7e2c680996bdd7b7f1d84bc14011451c7a5
parents 278b741e 132a5027
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