tree 6f74c7ac8774bce96cc4db664a0cb99294e84796
parent 95036f503c071482d72f20602bcdefbb6b817f14
parent 4a17c50d7b735e1ab94748684f4a7be54fe1a0ce
author Santiago Etchebehere <santie@google.com> 1561591494 -0700
committer android-build-merger <android-build-merger@google.com> 1561591494 -0700

Merge "Prevent NPE when current clock is null" into ub-launcher3-qt-r1-dev
am: 4a17c50d7b

Change-Id: I90dd53e943402be24ca082c37f852555239ad18d