tree d39bd3b245a84ae8635c99d545cebaa4f5ec35f7
parent 7409a6bb32d9717c95097a9c6145870d6cb45003
parent 968c9f495cc412ab75d172a88fe391bd619e6cb2
author Chalard Jean <jchalard@google.com> 1549445911 -0800
committer android-build-merger <android-build-merger@google.com> 1549445911 -0800

Merge "[KA03.5] Add stable AIDL parcelable for TcpKeepalivePacketData" am: 533b2960fc
am: 968c9f495c

Change-Id: I3b0645585140d8ee12f896946a2a1fbb519e6195