tree 6867a9658fee1734a92f020129c6d011cc26c2e5
parent 3c48647e4aa2cd4b2dbd317b4842f69d8c39ab04
parent 33e84c167863745514b56b97c391f8d8913ca05e
author Joe Fernandez <joefernandez@google.com> 1426799059 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426799059 +0000

am 33e84c16: am 8ca83e05: am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

* commit '33e84c167863745514b56b97c391f8d8913ca05e':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""