| commit | d5c5c04fb2f9a9535f9905141dcdbca34e2a96b6 | [log] [tgz] |
|---|---|---|
| author | Ady Abraham <adyabr@google.com> | Tue Jul 16 16:06:24 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 16 16:06:24 2019 -0700 |
| tree | 0c971ebfaf8499f88c13410f4bfb277aea7de678 | |
| parent | f121b180685a8141ffe6228be27cbbed484a55af [diff] | |
| parent | 8c21676750963609632ed25017c0db98b8ac30fc [diff] |
[automerger skipped] Merge "SurfaceFlinger: add display power state timer" into qt-r1-dev am: 7f882c4b23 am: 8c21676750 -s ours am skip reason: change_id Ib8ec3c9550336d691dd3868405d20b98aa983302 with SHA1 6fe2c17ee0 is in history Change-Id: I1acf28fb30712e384217bb6977101e4d0751c261