OSDN Git Service

Merge "Fix crash in mainline" am: 3a0d51f6b7
authorPaul Lawrence <paullawrence@google.com>
Tue, 27 Aug 2019 01:54:15 +0000 (18:54 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Aug 2019 01:54:15 +0000 (18:54 -0700)
am: 6c5944f899

Change-Id: I2d40676c59d364c02154bced41e6ce818b5d4886


Trivial merge