am c7c1dbc6: am 2a414b93: (-s ours) am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
* commit 'c7c1dbc6388bcb921b3404b8f664eac90df91c29':
This commit is contained in: