tree 3e50ecdc1f36ac0ff33aae1c461d10a598b76e03
parent be8e056d0e51b69ed56e58fde8be4f369937fd89
author Andreas Gampe <agampe@google.com> 1522171438 -0700
committer Andreas Gampe <agampe@google.com> 1522174282 -0700

Fix merge commit

Follow-up to commit a2640b6f5142697162d4f02b4134e78b268f4a4b

Test: mmma frameworks/base/tests/net
Change-Id: I5cdc873f6d0d0c39c8e0b38cd04c16fd16a47cbf