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:32:05 +0000 (11:32 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 5 Nov 2018 19:32:05 +0000 (11:32 -0800)
am: 4e8ad23c80  -s ours

Change-Id: I3ecb8639e74cbd720ffa5ee547e77c6898091907


Trivial merge