tree d6241f23b27eb48df0cd3f42ac6952212efbed2c
parent 328cbb7663ad188b3ffe1d184312106b78b53f60
parent a5a6e17d7e7bb12bc50d02923baab0a90f311a77
author Maarten Derks <maarten@fairphone.com> 1633511778 +0200
committer Maarten Derks <maarten@fairphone.com> 1633511778 +0200

Merge branch 'security-aosp-pi-release' into int/p/fp2

* security-aosp-pi-release:
  libbinder: uptimeMillis returns int64_t!

Change-Id: I3909aa4602eb0c50d9d769c3bfa191e8d6707a04