tree e3ff6cf87ebe48f806d2c84ba513f8b6130d201b
parent d567f5d81883c9c7b0ce2293b6681f2de83a863e
parent 5dc4cde03864248826e4539f971353be249e96e7
author Tianjie Xu <xunchang@google.com> 1538071310 -0700
committer android-build-merger <android-build-merger@google.com> 1538071310 -0700

Merge "Enable fingerprint in care_map" am: f3d0e4783f am: 881f4225f2
am: 5dc4cde038

Change-Id: I327a2e711f2a810cdc6d9561cff1eb22f094869e