| commit | 1f7f0d83c69fde2591cf62c74273d86229a20cb7 | [log] [tgz] |
|---|---|---|
| author | Prashant Malani <pmalani@google.com> | Fri Sep 04 16:15:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 04 16:15:25 2015 +0000 |
| tree | 2e4741ebb3a3f8700faa8bdf2536553d25cf6f01 | |
| parent | dd2c636d44fdd5ba1e81226af6c8be3c43c50d26 [diff] | |
| parent | 8e77a43ab1f090bbd112e1f7d5ae43fab8c96445 [diff] |
am 8e77a43a: am 8aba65bb: am ed3791e1: am 92df3435: Merge "Increase VirtualDisplay test timeout to 40s" into lmp-sprout-dev * commit '8e77a43ab1f090bbd112e1f7d5ae43fab8c96445':