tree 57798ca2b12471f89d3805bb60db13df0608e842
parent 381b1758f69a267e5e83d8d35319e1cf8da2884f
parent 35738049df5aa6b14ef0721375cf40c5e7c60539
author Martijn Coenen <maco@google.com> 1436868838 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436868838 +0000

am 35738049: am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev

* commit '35738049df5aa6b14ef0721375cf40c5e7c60539':
  Fix up Tap and Pay how it works.