OSDN Git Service

am 28ffd67e: am cd081547: (-s ours) am 091f0e5c: Make FingerprintService more toleran...
authorJim Miller <jaggies@google.com>
Thu, 27 Aug 2015 18:09:52 +0000 (18:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:09:52 +0000 (18:09 +0000)
* commit '28ffd67e187b4f9f9de79b7225ccd3e034c8e8fd':


Trivial merge