tree 5181f155b7b04dfca8a3672dbef7325e53c972a4
parent 5d63ac9422776074b7ca3d5f9a996d1425fe4e2a
parent ed6c1306476f9c75df8a8bbfb3a4206178456ecf
author Lorenzo Colitti <lorenzo@google.com> 1553079801 -0700
committer android-build-merger <android-build-merger@google.com> 1553079801 -0700

[automerger skipped] Merge changes from topic "framework-no-networkstack-aidl" am: 74867d1661 am: be2028471f
am: ed6c130647 -s ours
am skip reason: change_id I74531ef11d504b232d4f377532d5e0812dbc88db with SHA1 59d474b3c2 is in history

Change-Id: I694f5e54fba6ddc7a9f486b09ddaeaf54d50e9d1