Merge "Add emulator support for 280 and 360 dpi" into studio-1.4-dev