tree 7f44eeec2c2aac24f7174bb9b87ca5ac47f7b6e7
parent 35d909c0d4e9ccfa3eefb5ca1f907c048513bacf
parent 619b37a3616647e7ea32401b772ce65a8aff5e5a
author Martijn Coenen <maco@google.com> 1438166808 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438166808 +0000

am 619b37a3: am ef3614eb: am c16fd06a: am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev

* commit '619b37a3616647e7ea32401b772ce65a8aff5e5a':
  Resource for setting default NFC payment component.