tree 4ceb7ef625e79acb54646b2fe723ab41366f35ca
parent 83fa7d08c59c63511e8de4c12b8a89e69fcf06b8
parent 6343075fbf1fef40d421d060b807e8cbc08849cf
author Martijn Coenen <maco@google.com> 1378833194 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378833194 -0700

am 6343075f: am 9720d5e1: Merge "Remove legacy HCE APIs." into klp-dev

* commit '6343075fbf1fef40d421d060b807e8cbc08849cf':
  Remove legacy HCE APIs.