OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_a...
authorMyles Watson <mylesgw@google.com>
Mon, 5 Nov 2018 19:41:12 +0000 (11:41 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 5 Nov 2018 19:41:12 +0000 (11:41 -0800)
am: 4602780555  -s ours

Change-Id: I689ac30c7bf8f82cb6d6db38a3c629417cfaff9e


Trivial merge