tree 8c4c808fed5556bb7e583bbed64f35b2634fe305
parent f369a4fc100c4ba4e91e52fa078435518e3e36f7
parent 5f87f0b4b76039039affc521896d02c915d53e36
author Jim Miller <jaggies@google.com> 1437709283 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437709283 +0000

am 5f87f0b4: am 40481a71: am bf7cd01a: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev

* commit '5f87f0b4b76039039affc521896d02c915d53e36':
  Add FEATURE_FINGERPRINT to PackageManager's feature list