Skip to content
Commit 233ae500 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

[automerger skipped] Merge "DO NOT MERGE Revert all scrim related changes in... 

[automerger skipped] Merge "DO NOT MERGE Revert all scrim related changes in qpr" into qt-qpr1-dev am: 39195ba2
am: db59aba5 -s ours
am skip reason: subject contains skip directive

Change-Id: I178eca4ce0739bfbc2d49c0f85654dc14a805a93
parents 2e133ae3 db59aba5
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