OSDN Git Service

[automerger skipped] Fix crash in mainline
authorPaul Lawrence <paullawrence@google.com>
Thu, 19 Sep 2019 09:03:24 +0000 (02:03 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Sep 2019 09:03:24 +0000 (02:03 -0700)
am: 1b535e41fd -s ours
am skip reason: change_id I135099625f77344d1f8d2e8688735871c44ef2f5 with SHA1 9a6d1f73e5 is in history

Change-Id: Ibfc9efb88aaac867a710529631a30fe33ba570d3


Trivial merge