tree aa728b3e342c1f0b4a0f6622c4eb5c64d8f70242
parent de404776ed389a976a5a6432d3e2aa73e830d34c
parent 580cd295cdd3be96b10600a0c193543c6facd40c
author Xiao Ma <xiaom@google.com> 1560745189 -0700
committer android-build-merger <android-build-merger@google.com> 1560745189 -0700

[automerger skipped] Merge "Fix the potential NullPointerException." into qt-dev am: 73bd1afc54
am: 580cd295cd -s ours
am skip reason: change_id Ie6b5c293b4ca17622674d5f735a9d62e04410088 with SHA1 590bf9a468 is in history

Change-Id: I2725a292e059a6653d8dd1d7d671b1db7259ba8e