tree 9e36d590bdf82da22dcc4021011dd2a5bb64ccf9
parent 55d3bae235a8d233acd486385dad7836cb40da1f
parent 7e059716923cd02a4c42751c67892e090bfd5f33
author Megha Joshi <mjoshi@google.com> 1289616536 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1289616536 -0800

am 7e059716: (-s ours) am 48c698fc: Adding NFC sample resources (DO NOT MERGE)

* commit '7e059716923cd02a4c42751c67892e090bfd5f33':
  Adding NFC sample resources (DO NOT MERGE)