commit | 8db7136894db9b98bcaca9bc14f3a49c1f62eb2e | [log] [tgz] |
---|---|---|
author | Selim Cinek <cinek@google.com> | Fri Aug 04 20:14:18 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Aug 04 20:14:18 2017 +0000 |
tree | 6a060a6ac15286cba7fc5548d2d6dfcf82c1ecba | |
parent | 1f29ea467316128a9c1009461df49d96e5c207d5 [diff] | |
parent | c9981e4d2503d009bdc01c7fe45879d1a40b21cb [diff] |
Merge "Fixed that the screen could lock when launching camera" into oc-dr1-dev am: fb52158e85 am: c9981e4d25 Change-Id: I5e87e1dfb5ee705f24afd330524255dede8b6c2d