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

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

Change-Id: Id6e3805ee9a49e9edc2a6a16e60c3f54ade2990a
This commit is contained in:
Chalard Jean
2020-04-07 10:20:14 +00:00
committed by Automerger Merge Worker

Diff Content Not Available