OSDN Git Service

am 7120c7b6: (-s ours) am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
authorJim Miller <jaggies@google.com>
Thu, 27 Aug 2015 11:33:18 +0000 (11:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:33:18 +0000 (11:33 +0000)
commit2c8ee8e6e68fca38188379126cbb40c1aa8d5185
tree7f84c40aaa75cd61f165f55c1ed04452351a1edd
parent186116163ee8b6ed2197cfd0f6e734957da89046
parent7120c7b6e65557a05b46c7c915aee1a2390fd610
am 7120c7b6: (-s ours) am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev

* commit '7120c7b6e65557a05b46c7c915aee1a2390fd610':