tree 2f655735eb16d2f34751950cd0060d6b0b2564d7
parent eadeb92e788c84b188c69019da6b6e530f5f79cc
parent 80aa1aee48ddfb748590d3adf79be384acd57a3c
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1532107065 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1532107065 +0000

[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: fa2d999f6f am: 65f906e7ab am: 8f6afaa7fc am: e80eab6cca skipped: 80aa1aee48

Change-Id: Ia2aafdffd87d9f7a00429d50783e64864fe92db3