commit | f54ffd1381ec15345abba436282bcf0eeb435b12 | [log] [tgz] |
---|---|---|
author | Prashant Malani <pmalani@google.com> | Fri Sep 04 16:39:18 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 04 16:39:18 2015 +0000 |
tree | 57fb35c360b3116cdbccdd9ada3045348f758f4a | |
parent | 53c099dc3721d23c645021da9416b7ff0a794b58 [diff] | |
parent | efdb39468ab263a747961cc692132104f1be1fdd [diff] |
am efdb3946: am 1f7f0d83: am 8e77a43a: am 8aba65bb: am ed3791e1: am 92df3435: Merge "Increase VirtualDisplay test timeout to 40s" into lmp-sprout-dev * commit 'efdb39468ab263a747961cc692132104f1be1fdd':