tree 3bb3e409c0595d8dcb8ec8f175290fdd5dfa09ee
parent e83f0638fe651e032476251170cf434f7edb607d
parent a228b61e742384d4b265843701338518169d3b66
author TreeHugger Robot <treehugger-gerrit@google.com> 1501707336 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501707336 +0000

Merge "Flatten FingerprintManagerCompat" into oc-mr1-dev