OSDN Git Service

Merge changes from topic "am-2c2c464f-fb3a-4c93-8661-57c986c3e069-nyc-dev" into cw...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 20 Jul 2018 18:25:33 +0000 (18:25 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Jul 2018 18:25:33 +0000 (18:25 +0000)
* changes:
  [automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: 51b656f12b am: d305a203ce am: 38961f6b41
  [automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: 51b656f12b am: d305a203ce
  [automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: 51b656f12b
  DO NOT MERGE SDP: Fix the param_len recalculation


Trivial merge