tree 335f511ac77b7d4368e9c6af17e1ef440aa24ded
parent ff8be5d87aa36716110196eab916e234dfe79775
parent 46c0bc94074ba7a72f8146c0e964d7353ff15df4
author Bryan Ferris <bferris@google.com> 1561491223 -0700
committer android-build-merger <android-build-merger@google.com> 1561491223 -0700

Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev
am: 46c0bc9407

Change-Id: I9640adc59d47dbbb36183073a1c6bc2d0624d893