tree dc0e7de5b9405768a782b6b0b1a93cbf8c8e6db5
parent 1d209d1b0c0ebc9e9a35b0929ad3efefc1eaaf32
parent 7a1ec5dbcc24d54284d79b8fdf60c61751dbd481
author Kevin Hufnagle <khufnagle@google.com> 1474935071 +0000
committer android-build-merger <android-build-merger@google.com> 1474935071 +0000

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

Change-Id: I381c457d3de402ba7cae896517aac78fb6d272d6