tree e49292284b5bc17246927451170287c7d0c728b4
parent 829ea1ae4e36fb4aafc4ddeb506810233e98819e
parent 680c62d61bc28a17d3283976e3c3061cbec9993e
author John Stultz <john.stultz@linaro.org> 1545282015 -0800
committer Alistair Strachan <astrachan@google.com> 1545340337 +0000

Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD

Merge in Offset multiplication overflow fix.

Change-Id: If4922eaa4af1cbfa1b4454c5aaea910324d3b85b
Signed-off-by: John Stultz <john.stultz@linaro.org>