tree 1adfd4127d33f87c57859fac6c4d1cecff6b9fb9
parent 4b40766c723e0dee8aa4fa55b5f73b93f2ada943
parent 0c23c7cecfb8c44ae06c59d5c09b11f0e704c5df
author Steven Moreland <smoreland@google.com> 1565211940 -0700
committer android-build-merger <android-build-merger@google.com> 1565211940 -0700

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

Change-Id: I1e8d7bf4e285a0bf8b5855725a568747c0847925