tree 9d34d34dd4e1f9ddaefe1d38f8321ded4a9e3682
parent f4686ea633adeb14c93038e0dc3dc8599ea73511
parent 315855b541886772eb0e6f21a77273c26bb67947
author Paul Lawrence <paullawrence@google.com> 1568884162 -0700
committer android-build-merger <android-build-merger@google.com> 1568884162 -0700

[automerger skipped] Fix crash in mainline am: 1b535e41fd -s ours
am: 315855b541 -s ours
am skip reason: change_id I135099625f77344d1f8d2e8688735871c44ef2f5 with SHA1 9a6d1f73e5 is in history

Change-Id: Ic79d3e61e2167da5bcfcfaa08086ff9e6bcf5747