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:45:13 +0000 (01:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 01:45:13 +0000 (01:45 +0000)
am: 21187ba5cc

Change-Id: Iae5a62d77719833dc91c881bd3b90c9ab327a0bf

1  2 
core/res/AndroidManifest.xml

Simple merge