tree 207ff3ab341ffd9805aa41b3c3c916821c326e6f
parent 68f79718f7c4f648533e1ecd7f66d0b30f161b64
parent 3d9cb9261849d8178ce834c8216fe2154db4e5af
author Maurice Lam <yukl@google.com> 1439333015 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439333015 +0000

am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev

* commit '3d9cb9261849d8178ce834c8216fe2154db4e5af':
  [Fingerprint] Use different ring size for setup