| commit | 3ccfa356679b21b9df046fcf829b1ab2ec09451c | [log] [tgz] |
|---|---|---|
| author | Hiroki Yamamoto <hiroki.a.yamamoto@sony.com> | Thu Jul 06 01:52:15 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 06 01:52:15 2017 +0000 |
| tree | db4efb4ce25452ae0c9bda17f4f35f8661febfa6 | |
| parent | 41d52b1bb2301a0cdddbfc62a7c847fe5e869902 [diff] | |
| parent | 1a6d0d753ef004d8c72ea2a7e5548c7fc8cfbd9a [diff] |
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc am: 1a6d0d753e Change-Id: I7e45537f7a81ac42be1a24adeadfbf3f7b665109