[automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 am: 67cdd0d1a1 am: 96f01a4f80 am: 8760b8142a -s ours am: 827c964660 -s ours

am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 3854ed0c53 is in history

Change-Id: I46de00be514ce498977027f3d7b7a10c4265c1f5
This commit is contained in:
Chalard Jean
2020-04-11 06:28:32 +00:00
committed by Automerger Merge Worker

Diff Content Not Available