tree 922eb40713fd41e4aa1aa04758b00061b8a8560f
parent b601d5db9e72aaaa9d2fa20a638860f1ca37d294
parent f231c6280212123fbdbd1879a53b2762d3206d92
author Glen Kuhne <kuh@google.com> 1487700862 +0000
committer android-build-merger <android-build-merger@google.com> 1487700862 +0000

Merge "Move wifi.proto to shared service .jar" am: 9ca5ddff4c am: d0dcf559c5
am: f231c62802  -s ours

Change-Id: I78421f235461a8534c2b2995873f25b3c86121e8