| commit | 17f2f1633ba3e025624ab45a55b7629abf51c0c8 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jul 06 01:47:37 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 06 01:47:37 2017 +0000 |
| tree | 0012fe1fce1052c677cac9d5af93a44b848f1e8d | |
| parent | 1a6d0d753ef004d8c72ea2a7e5548c7fc8cfbd9a [diff] | |
| parent | d80f0251fece190420768ce0bb27bad827ac1c34 [diff] |
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc" into stage-aosp-master