tree 6015ffd3940dedacfbaa33ad0a0165358bf35785
parent 05cde4d41f10854235174706934549bfb97dac0b
parent e50f48d93f311c7143a051e2244d68c9f19507c5
author Tor Norbye <tnorbye@google.com> 1423176019 +0000
committer android-build-merger <android-build-merger@google.com> 1423176019 +0000

Merge "pixel perfect: Disable controls" into studio-1.1-dev automerge: b234933
automerge: e50f48d

* commit 'e50f48d93f311c7143a051e2244d68c9f19507c5':
  pixel perfect: Disable controls