tree 9528872a2e49321c6718a9bf44edb567cf3cbbc1
parent 0b498d613929d35d97c86d590691867f6347204f
parent bd66ef7f2f1832a0e9421297fa141b3df469b02c
author Kevin Hufnagle <khufnagle@google.com> 1474930058 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1474930063 +0000

Merge "docs: Revised "activity launched with NFC intent" code sample to demonstrate using onNewIntent() in these situations" into nyc-dev