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