tree e5e0d8a8772edc34d68b1971b3a63b9693741a85
parent b34eeb70a695af5daf876d13502df0cb20b8e4bb
parent 777f5b2f47840357e95f3354b83cf500ba82f0ee
author Jim Miller <jaggies@google.com> 1409090571 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409090572 +0000

Merge "Hide fingerprint API until new API is ready" into lmp-dev