tree e3ff6cf87ebe48f806d2c84ba513f8b6130d201b
parent afafd332ee886981b955187b618dbdbf1b783cb1
parent 881f4225f26a28a0611247aee919006306986f57
author Tianjie Xu <xunchang@google.com> 1538070646 -0700
committer android-build-merger <android-build-merger@google.com> 1538070646 -0700

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

Change-Id: I73b319d426896550e5ed037dd7f69de030ff2c46