tree d91e88e7b176bcc492a2b732ada73f042da6afe2
parent aee4137bd1270737d85ad772dafae21451fb0295
parent 0e04a7cd7ac88ec850a24d15a884a52663ca82d5
author Griff Hazen <griff@google.com> 1438387355 +0000
committer android-build-merger <android-build-merger@google.com> 1438387355 +0000

Merge "Add emulator support for 280 and 360 dpi" into studio-1.4-dev
automerge: 0e04a7c

* commit '0e04a7cd7ac88ec850a24d15a884a52663ca82d5':
  Add emulator support for 280 and 360 dpi