| commit | 6e0ef8958e5d1ed0b880e8ec8004bcd40fc456dc | [log] [tgz] |
|---|---|---|
| author | Kevin Ma <kma@google.com> | Tue May 13 19:41:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 19:41:14 2014 +0000 |
| tree | 99e314c2f39b22f56f0c884a3dc2cbf743778fb0 | |
| parent | e100b5fc27a7af6fe0e895b9c1a026602edaeda5 [diff] | |
| parent | 3b51ecf2218e8232a6733c0881894a3903e6efd0 [diff] |
am 3b51ecf2: am 0dfb3f46: Merge "In CTS EglConfigTest, keep screen on to prevent test stuck." into klp-modular-dev * commit '3b51ecf2218e8232a6733c0881894a3903e6efd0': In CTS EglConfigTest, keep screen on to prevent test stuck.