tree 5238322a23342b8176a5a8d8c6c503567b9339db
parent c629271d480ea618fd3b9ae2c6ff3028b2a1732d
parent 61a7d1f5f6963a55cb519ef7364e9e7ca4059584
author Selim Cinek <cinek@google.com> 1435007576 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1435007577 +0000

Merge "Follow-up to empty keyguard issue" into mnc-dev