tree bde7d121ae16aaf3de17d9c8daccd1a5d9803f36
parent 98961ea0007ab540794c8d460d9b060e9503d9c6
parent 08edf246e97b60098a1e7c661b99412577f231f0
author Andreas Gampe <agampe@google.com> 1437775016 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437775016 +0000

am 08edf246: am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev

* commit '08edf246e97b60098a1e7c661b99412577f231f0':
  Frameworks/base: Hand fingerprint to ART