From: Kevin Hufnagle <khufnagle@google.com>
Date: Tue, 27 Sep 2016 00:11:11 +0000 (+0000)
Subject: Merge "docs: Revised "activity launched with NFC intent" code sample to demonstrate... 
X-Git-Tag: android-x86-7.1-r1~1207
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c5daecf9062bf92bfee571f20af6021ba108d36e;p=android-x86%2Fframeworks-base.git

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
---

c5daecf9062bf92bfee571f20af6021ba108d36e