tree 78dd27e45615e3336848659a7942453e65df6ac6
parent 9d59a2441ee59b0fe74f49cb12de3af2cab89da1
parent 1b8d5ffb47b674dd67ae6d56baa9ab3f42c8c024
author Chris Wren <cwren@android.com> 1439830076 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1439830076 +0000

Merge "instrument fingerprint settings" into mnc-dr-dev