OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE: SDP: Recalculate param_len after max_list_l...
authorMyles Watson <mylesgw@google.com>
Fri, 1 Jun 2018 01:57:49 +0000 (18:57 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jun 2018 01:57:49 +0000 (18:57 -0700)
am: 4af0e3b940  -s ours

Change-Id: I50544f88c699ac5a242e2d4da7eef85c6c075e1e


Trivial merge