commit | 48965bc07b756ae551222f270a3d3054186d5683 | [log] [tgz] |
---|---|---|
author | Tor Norbye <tnorbye@google.com> | Thu Feb 05 22:40:19 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 05 22:40:19 2015 +0000 |
tree | 6015ffd3940dedacfbaa33ad0a0165358bf35785 | |
parent | 05cde4d41f10854235174706934549bfb97dac0b [diff] | |
parent | e50f48d93f311c7143a051e2244d68c9f19507c5 [diff] |
Merge "pixel perfect: Disable controls" into studio-1.1-dev automerge: b234933 automerge: e50f48d * commit 'e50f48d93f311c7143a051e2244d68c9f19507c5': pixel perfect: Disable controls