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)
commit992fc965c4301c973e3668dd53ef041e2d9c961c
tree6382445f54a493ecaf9dfe1ee27c387082df574e
parentd3bb538dc836cb1759df4a6af5635384831299b9
parentf066a42e32b2b5e9f51403762cf3151dcf57278c
Merge changes from topic "am-2c2c464f-fb3a-4c93-8661-57c986c3e069-nyc-dev" into cw-f-dev

* 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