tree e2ecdf2fe6a329cca6d86c59f6decb0ec6020faf
parent 69e48724014be52b97e17fcc11610c1e1c0ae516
parent 0f290c968325566785d8d990d6302eb953dbbabc
author Kevin Hufnagle <khufnagle@google.com> 1474931926 +0000
committer android-build-merger <android-build-merger@google.com> 1474931926 +0000

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

Change-Id: I3388ff611a3e1bd7cc5242c1a446c552a444f01d