OSDN Git Service

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc...
authorHiroki Yamamoto <hiroki.a.yamamoto@sony.com>
Thu, 6 Jul 2017 01:58:59 +0000 (01:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 01:58:59 +0000 (01:58 +0000)
commit5dd3f8fa855a542a050aff8b1e21b3b6da0f6986
treed844ad2720314e17a185e21a5d90750522b9152e
parentbb8568d903f2bc731d8cfd8eea9932895881cc7b
parent3ccfa356679b21b9df046fcf829b1ab2ec09451c
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc am: 1a6d0d753e
am: 3ccfa35667

Change-Id: I45ba5cbd9eda39c10c5a26405766905e45eaa6ea
core/res/AndroidManifest.xml