tree ff5bf30242ff444d41cfeb257d4914bb38905b2e
parent 7de4fc3d0e8d5f7f4c539b7043afe20453f384ea
parent 5715016b1e835c2dd00b4a3688af86fec314ac14
author Griff Hazen <griff@google.com> 1440711392 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440711392 +0000

am 5715016b: am f745ab51: (-s ours) am 5c465206: am b17eca69: Merge "Add new density constant - 360dpi" into studio-1.4-dev automerge: f0fbff3 automerge: 0d69db1

* commit '5715016b1e835c2dd00b4a3688af86fec314ac14':