Merge "Hide padlock when launching camera" into qt-dev am: b82f6d6436
am: a1cf5ca594
Change-Id: Ie8571ec6748d2de951cc1ca7bb0730967bf5c21c
This commit is contained in:
b82f6d6436
am: a1cf5ca594
Change-Id: Ie8571ec6748d2de951cc1ca7bb0730967bf5c21c