tree 2289f137e5ad5ad4d3cf1d979d8f5ffa85562176
parent b68b0762ccd4ad9f43ab8c790f76c21db959a364
parent 02018f8babe7be237dc9f80f93edbe32a8de47e3
author Griff Hazen <griff@google.com> 1438389062 +0000
committer android-build-merger <android-build-merger@google.com> 1438389062 +0000

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

* commit '02018f8babe7be237dc9f80f93edbe32a8de47e3':
  Add emulator support for 280 and 360 dpi