tree ce3c5f6981e744f86dca70a948444d31b4383f09
parent 02d6277b9508cbc30c76193a9aea3a7b8f9d9cfc
parent bc45a6df5bd70c918865720cc0afb478e7880788
author TreeHugger Robot <treehugger-gerrit@google.com> 1556555183 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1556555183 +0000

Merge changes from topic "natt-aidl+aidl-freeze" into qt-dev

* changes:
  Add AIDL parcelable for NattKeepalivePacketData
  Move NattKeepalivePacketData out of the framework