Commit f1abdf68 authored by Takeshi Hagikura's avatar Takeshi Hagikura Committed by android-build-merger
Browse files

Merge "Make the FingerprintDialog sample buildable with Android.mk so that... 

Merge "Make the FingerprintDialog sample buildable with Android.mk so that both engineers can quickly iterate the changes over the sample. am: 23fbc974 am: a92a07a0" into nyc-mr1-dev-plus-aosp
am: c9b216d6

* commit 'c9b216d6':

Change-Id: I239421f3b874f58c3abf878116a58770d0142777
parents 33a1d5a9 c9b216d6
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment