| commit | 62f8d2c3b769b01fa542f85321984d70c4726a15 | [log] [tgz] |
|---|---|---|
| author | Kevin Hufnagle <khufnagle@google.com> | Tue Sep 27 02:19:05 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Sep 27 02:19:05 2016 +0000 |
| tree | e10ee9a60cbee9dd7660f3316dfd48451d530e01 | |
| parent | 6361cc172988ce6620933162ae3cf42a641e3f67 [diff] | |
| parent | 39f02cf0d9c7e8c0bd34708c7a88ac201dcad220 [diff] |
Merge "Merge "docs: Revised "activity launched with NFC intent" code sample to demonstrate using onNewIntent() in these situations" into nyc-dev am: 0f290c9683 am: e2f1d3f3a5" into nyc-mr1-dev-plus-aosp am: 39f02cf0d9 Change-Id: I4cd45334b493a7a71b0563be8017f13e6c6f952f