[automerger skipped] Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570 am: 007bff06ea am: 3a52d0f78c am: c0c2991fbf -s ours

am skip reason: Change-Id I3e17211c03bc74426bf5e2e414ec322d73b0060b with SHA-1 1c48f85a21 is in history

Change-Id: Ia8eeaafb958eeaf50cf3a6f57a6f9391a7b6e3d3
This commit is contained in:
Chalard Jean
2020-04-07 10:39:27 +00:00
committed by Automerger Merge Worker

Diff Content Not Available