| commit | 808ae634dd17f7c7093ade11375ab06918beb41e | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jul 06 01:53:59 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 06 01:53:59 2017 +0000 |
| tree | db4efb4ce25452ae0c9bda17f4f35f8661febfa6 | |
| parent | 3ccfa356679b21b9df046fcf829b1ab2ec09451c [diff] | |
| parent | 5a9226ffd48b01a5c6993666e188731bc8a01a66 [diff] |
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc am: 1a6d0d753e" into oc-dev-plus-aosp