tree 1e5d226c31b9664031333579e1f18caab7f8b8cb
parent a33a5795225ed119a04a3d35957786d7d266dfbe
parent 857e0e415471d288b93cf014301c6e981d1e9d01
author Nasser Grainawi <nasser@codeaurora.org> 1622743038 -0600
committer Nasser Grainawi <nasser@codeaurora.org> 1622743038 -0600

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Apply gjf

Change-Id: Id781ccd4b996a0c55a298ff03f66b985f5b5459d