tree 105acd181bb8b1c228cc536e52f1ec9937699558
parent a86151a911726ea293f374f0ee4a80c0992a6647
parent 33c3ab90e09168f7e781b4e32fa0d2dab5d95b13
author vnori <vnori@google.com> 1537917728 -0700
committer android-build-merger <android-build-merger@google.com> 1537917728 -0700

Merge "Add hidden API to return "Uploading" bit value from SDP record's MapSupportedFeatures." am: 51ec0ebbee
am: 33c3ab90e0

Change-Id: I05c8550bfece64e52a52f580f73d873a4a9851d8