commit | e78a4ce1b6b491da53a21ba78b6820fab6245b35 | [log] [tgz] |
---|---|---|
author | Selim Cinek <cinek@google.com> | Fri Aug 04 20:25:25 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Aug 04 20:25:25 2017 +0000 |
tree | 8b9c527bce79077d37cd8ec386feef143066e1ff | |
parent | 916daa4223667d9a0ba569d62b3e11b028d524b1 [diff] | |
parent | 1f29ea467316128a9c1009461df49d96e5c207d5 [diff] |
Merge "Fixed that the screen could lock when launching camera" into oc-dr1-dev am: fb52158e85 am: 7315623761 am: 1f29ea4673 Change-Id: I48a67b2b5b0e68cb738ef358388eba9da05c66d2