[automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: c1f1682fbf -s ours am: 03e57ffd43 -s ours

am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 2b8bde162f is in history

Change-Id: I225ac40b48c65512c7ec594c80fa391599a728dd
This commit is contained in:
Zoey Chen
2020-03-24 09:56:18 +00:00
committed by Automerger Merge Worker

Diff Content Not Available