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