tree 28f80995b60cb967fcb90606d4c0998031754ed8
parent 7bff17adacd9582347a3671a5e1f37ac876012d1
parent 05948baa045973747cad0e75b61a08af240923ff
author Krzysztof Semko <krzysztof.semko@sony.com> 1542254316 -0800
committer android-build-merger <android-build-merger@google.com> 1542254316 -0800

Merge "Do not update time offset for time lapse recording after pause" am: a864ea5f2d
am: 05948baa04

Change-Id: I38f29db5e54427f9e0a8873473c56dc14cd458a6