Commit 8ab5c13b authored by Tor Norbye's avatar Tor Norbye Committed by android-build-merger
Browse files

Merge "pixel perfect: Disable controls" into studio-1.1-dev automerge: b234933d automerge: e50f48d9 

automerge: 48965bc0

* commit '48965bc0':
  pixel perfect: Disable controls
parents ad4387f2 48965bc0
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