| commit | e7d375631107a8c531e0c4636d429e9a8736ce79 | [log] [tgz] |
|---|---|---|
| author | Griff Hazen <griff@google.com> | Thu Aug 27 21:37:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:17 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 15148cd1e9a21f8761f63bdb87e8f6fc4cda16b9 [diff] | |
| parent | 7da949b8d02465ba4e6c8b7cdc9efd80f5d99072 [diff] |
am 7da949b8: am defb2cb4: (-s ours) am 5b432fd4: am 5b6cfc6b: Merge "Allow 360dpi devices for avd" into studio-1.4-dev automerge: 3874d2d automerge: 84ba591 * commit '7da949b8d02465ba4e6c8b7cdc9efd80f5d99072':