tree 4f2949644b6a750b4487c3790059b554fcd0682b
parent 47a81105daa5e406b5bad4a734a734ed37edb076
parent 834eca8da7a8fb8f0113367f0e239a2572e8b184
author David Turner <digit@google.com> 1466668349 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1466668349 +0000

Merge "Simplify emulator-specific logic."