OSDN Git Service

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"
authorHiroki Yamamoto <hiroki.a.yamamoto@sony.com>
Thu, 6 Jul 2017 01:46:20 +0000 (01:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 01:46:20 +0000 (01:46 +0000)
am: 21187ba5cc

Change-Id: I9117f76d5a03d3aa222c87338bd7249184b3041d

1  2 
core/res/AndroidManifest.xml

Simple merge