tree 773e1978749297a95bd800235e6213ef0953c86c
parent 7ae4bc7d9237be8a15fcdcee19a8aa4862d62894
parent 3ed7588987db4b08c791207c09b67335de7b60be
author Hunter Knepshield <hknepshield@google.com> 1580175440 -0800
committer android-build-merger <android-build-merger@google.com> 1580175440 -0800

Merge "Fix minor time bug in ConsentCallback::getElapsedTimeMs"
am: 3ed7588987

Change-Id: Idda4a1965dec2ab4eb78257f3c4451d7b08e6381