[automerger skipped] Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570 am: 93ef311226 -s ours am: 1f12fbe878 -s ours am: bdc29fb104 -s ours

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

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

Diff Content Not Available