tree 8b9c527bce79077d37cd8ec386feef143066e1ff
parent e78a4ce1b6b491da53a21ba78b6820fab6245b35
parent 8db7136894db9b98bcaca9bc14f3a49c1f62eb2e
author Selim Cinek <cinek@google.com> 1501878436 +0000
committer android-build-merger <android-build-merger@google.com> 1501878436 +0000

Merge "Fixed that the screen could lock when launching camera" into oc-dr1-dev am: fb52158e85 am: c9981e4d25
am: 8db7136894

Change-Id: Ib8243dfc97a71956c0c1dfc8b845d57bde9dc6e9