tree 845eb03a40493d9be0c28c66c24a4cfc5a746da4
parent a3a165db19d0a4552a1cc88290651d6f23626bdb
parent 4ab03e1367fb23d75f1197a98c7a52dd3e3898b9
author zhenqing.x.qiu <zhenqing.x.qiu@sonymobile.com> 1504290397 +0000
committer android-build-merger <android-build-merger@google.com> 1504290397 +0000

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

Change-Id: I24973e3f6546a235c9af1ababf0925557477f6b9