tree 938a54d763698c2247afc4d2c990cb8b1c4e6c70
parent 4d00a13c35e67a6f812425b8dd8afe1381ac3ccd
parent d0dcf559c592aa5894b3363810237998f80fccd1
author Glen Kuhne <kuh@google.com> 1487700391 +0000
committer android-build-merger <android-build-merger@google.com> 1487700391 +0000

Merge "Move wifi.proto to shared service .jar" am: 9ca5ddff4c
am: d0dcf559c5

Change-Id: I7c0095922c87073732f29b623aee2d99608511cf