| commit | b7118cebc3d489f17178dde1e8d3a799506551db | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Thu Feb 05 22:54:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 05 22:54:43 2015 +0000 |
| tree | a8bdd20587ea115d9c186de685adafa80f70080d | |
| parent | 95da5f4b8b24daee1b30ea531e9308871a92dd91 [diff] | |
| parent | 8ab5c13b8161ecb1dab460b8b2b9020f17eef790 [diff] |
am 8ab5c13b: Merge "pixel perfect: Disable controls" into studio-1.1-dev automerge: b234933 automerge: e50f48d automerge: 48965bc * commit '8ab5c13b8161ecb1dab460b8b2b9020f17eef790': pixel perfect: Disable controls