commit | 009113cb9e1ce8b737e0dcc11cb6525e81b23c86 | [log] [tgz] |
---|---|---|
author | Beverly Tai <beverlyt@google.com> | Thu Jul 29 16:10:27 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 29 16:10:27 2021 +0000 |
tree | f5dd7b11d9e998fb0fc368a7a1f647e72297a66d | |
parent | eb3b16c398e4016c4a294b44ef26de58baac2764 [diff] | |
parent | 7e031eb4a9dc5efd2810ec6b3a3f96019938a6b3 [diff] |
Merge "Don't setDeviceEntryIntent on AOD" into sc-dev am: 11f74e42a5 am: bc963b8701 am: 7e031eb4a9 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15412657 Change-Id: I61294f91d45347bb251a0e255cb4d6202357f858