diff options
| author | Hiroki Yamamoto <hiroki.a.yamamoto@sony.com> | 2017-07-06 02:12:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-06 02:12:01 +0000 |
| commit | bdef215c41cb3f03def7070a99fe2583e4f385e1 (patch) | |
| tree | d1db82864c5377a1ddf7cfc1f8e2c44988a9e9b6 /docs/html/sdk/api_diff/18 | |
| parent | d95b89de2e1570c809e13ef319cb2e477706b1cc (diff) | |
| parent | 75fd97e073cc0d707090aa20e48e40d7188dcfcc (diff) | |
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc am: 1a6d0d753e" into oc-dev-plus-aosp am: 808ae634dd
am: 75fd97e073
Change-Id: I11d87a5775f0d0e3bdd35378c9b3c18b9ea089a1
Diffstat (limited to 'docs/html/sdk/api_diff/18')
0 files changed, 0 insertions, 0 deletions