tree 53bc7f7d2a7a36e47dbadf0227e4f0a99867413d
parent d0bcc85a315bdb9c926444505634c9fa8630426e
parent 0f55b9785f73c179f341c3bd0815f286442eb3d1
author David Su <dysu@google.com> 1576568127 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1576568127 +0000

Merge changes from topics "framework-wifi-apex", "split-framework-wifi"

* changes:
  Move framework-wifi into the Wifi APEX
  Move annotations to WifiAnnotations