commit | 5a81952ce7314aaf17a1155085fa6a57e048e640 | [log] [tgz] |
---|---|---|
author | junyulai <junyulai@google.com> | Mon May 13 07:53:24 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon May 13 07:53:24 2019 -0700 |
tree | 94ea6d0ca9ee8c3981cc59786f99bbf84e932bb0 | |
parent | 95538d2d6b13188c9a742000a85517aef28bb833 [diff] | |
parent | 223535d86292ff5c279b7ab9b0c18de5d46ac802 [diff] |
[automerger skipped] Merge changes from topic "cleanupkeepalive" into qt-dev am: c31ccecf6c -s ours am: 223535d862 -s ours am skip reason: change_id I0481a469ee23231e5f0ab738a06b5e09f6cdb680 with SHA1 cf43dbdbc6 is in history Change-Id: I487ad4a020a25c1d12b6370589777685261b8af0