tree dd55469a02edc56dca20b1388976e20b91edccec
parent 9c98383ed881c0e4f1f162ea65b22da103980071
parent bc7a9d2dd4f38d9cf37ad73b6edb782b92c73cf2
author Mukesh Agrawal <quiche@google.com> 1475795881 +0000
committer android-build-merger <android-build-merger@google.com> 1475795881 +0000

Merge "Add wifilogd to generic image" am: c278a63560
am: bc7a9d2dd4

Change-Id: Idb88e9004f8c123bc484b078f5c6b3e08590b9e1