tree 4b3daff6ad79135e1f163b09f12ced464891f31a
parent 75cd3e1c01f0d32a1911d77ca75f3c2dc347122c
parent 27e8675a927ae81a121dcae1a3189c58a9370f9a
author zhenqing.x.qiu <zhenqing.x.qiu@sonymobile.com> 1504291358 +0000
committer android-build-merger <android-build-merger@google.com> 1504291358 +0000

Merge "Add null check to avoid crash when incoming beam of contact" am: 4ab03e1367 am: d863125dd0 am: db391c3381
am: 27e8675a92

Change-Id: I649ba5edf1454855fbcbe4aeb4d1d0cb0a236c64