OSDN Git Service

am e63322f6: resolved conflicts for merge of f90628c6 to mnc-dr-dev
authorMaurice Lam <yukl@google.com>
Wed, 15 Jul 2015 22:32:43 +0000 (22:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 22:32:43 +0000 (22:32 +0000)
commit649215a50c65b512b51cd21b54e479cd4ff3b926
treef71ccbd1c752530974606f345f682da6979a7cef
parenteb37daffa1291056d4ff99e94ea96e05a1e8f7b1
parente63322f640cf955ba296e064b07e4920d334f851
am e63322f6: resolved conflicts for merge of f90628c6 to mnc-dr-dev

* commit 'e63322f640cf955ba296e064b07e4920d334f851':
  [Fingerprint] Export FingerprintEnrollIntroduction