tree 6a060a6ac15286cba7fc5548d2d6dfcf82c1ecba
parent d7ee565bc348cba4438bb74fad8f2a492cce25dc
parent 7315623761f6404029b12e50eba521fe6669bcb4
author Selim Cinek <cinek@google.com> 1501877345 +0000
committer android-build-merger <android-build-merger@google.com> 1501877345 +0000

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

Change-Id: I1b484b195abab99e194a665102ca5ac2cf85bf4c