tree 64f3cdb6ca779b2641e922f1bf47c1321cdec768
parent 01dd0e86546a5bf815dd9a6e7cd4b7bf8e8f5719
parent 1ad0fe6c3670f185bddeb0b4d17aba237765ea6b
author Griff Hazen <griff@google.com> 1424893185 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1424893196 +0000

Merge "Always draw the circular emulator overlay with square dimensions" into lmp-mr1-modular-dev