commit | d32c1bcf0d76ac6caecfb169941e2df33a15ad24 | [log] [tgz] |
---|---|---|
author | Kevin Hufnagle <khufnagle@google.com> | Tue Sep 27 07:11:42 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Sep 27 07:11:42 2016 +0000 |
tree | 0c666664461f3c0f85354eae1be8d3cca55f1017 | |
parent | d37dcdf37cde213e32782f8a050d608bffd82b68 [diff] | |
parent | 98caeaa4959f6ad3609a2895bbc2fca27d9b6762 [diff] |
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 am: c5daecf906 am: 98caeaa495 Change-Id: If9e81952a9807402d3a32951d1c8c8e1e836edff