OSDN Git Service

[automerger skipped] Merge changes from topic "bp-real-calling-(p|u)id-merge-first...
authorBryan Ferris <bferris@google.com>
Tue, 25 Jun 2019 20:32:26 +0000 (13:32 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Jun 2019 20:32:26 +0000 (13:32 -0700)
am: 752d4f8e96 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 f5e5af7f3d is in history

Change-Id: I309479f61253fa6cefec4377e000a3ab173a39c0


Trivial merge