tree c87a5116534340457395401c8ce5089ed071b036
parent 19159dbc9507873b465914a9c62d4dd71f0e24ef
parent 533b2960fc260de7b9bad62b393690517f4eef1d
author Chalard Jean <jchalard@google.com> 1549445364 -0800
committer android-build-merger <android-build-merger@google.com> 1549445364 -0800

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

Change-Id: I3ee97cd66e19486ba0edd6cab58bd37b43a0904b