tree 1adfd4127d33f87c57859fac6c4d1cecff6b9fb9
parent 855f5c337a6b87bfae7e179d7cb0ff7470db48cf
parent 4dc2f1e548b637ac8a5c35b6cb7765b74aae585c
author Steven Moreland <smoreland@google.com> 1565212547 -0700
committer android-build-merger <android-build-merger@google.com> 1565212547 -0700

[automerger skipped] Merge "libbinder: stability check moved to trans time" am: 9f268673bb -s ours am: 7ee88d384e -s ours am: 0c23c7cecf -s ours
am: 4dc2f1e548 -s ours
am skip reason: change_id Iff026e81a130dbb8885ca82ec24e69a5768847eb with SHA1 6e5a77537f is in history

Change-Id: I9cf173be018dfc2e2d0ce3e6972608ebe9d4abc8