| commit | bdbe454b7a9d453bb1a101e66103bfde9a975b5a | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jul 06 01:55:35 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 06 01:55:35 2017 +0000 |
| tree | db4efb4ce25452ae0c9bda17f4f35f8661febfa6 | |
| parent | 808ae634dd17f7c7093ade11375ab06918beb41e [diff] | |
| parent | c70a13f32f64f52af3ec5eab6f9483f29e18f942 [diff] |
Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc" into stage-aosp-master am: 17f2f1633b" into oc-dev-plus-aosp