tree 773e1978749297a95bd800235e6213ef0953c86c
parent 35a5e3b93d710d02ca0e8382b5f9164754e74e5d
parent c17ca50b172562e3f6c8ea3e68b69dc7be1ae021
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580176103 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580176103 +0000

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

Change-Id: I8f700fdbc1fd32e8bd6109a491725dcb4bd693c4