Merge "Use Application#registerLifecycleEvents() instead of a Fragment for Beam."

Author: Nick Pelly

core/java/android/nfc/INfcAdapter.aidl

@@ -42,7 +42,7 @@ interface INfcAdapter
 
     void setForegroundDispatch(in PendingIntent intent,
             in IntentFilter[] filters, in TechListParcel techLists);
-    void setForegroundNdefPush(in NdefMessage msg, in INdefPushCallback callback);
+    void setNdefPushCallback(in INdefPushCallback callback);
 
     void dispatch(in Tag tag);