tree 4e403060344a211ed714971bd09429929ba4ebf4
parent 37fcad07278072c6cbd0c3579747d3744d00c550
parent d988cb11b57956297beef31a62c02628b0f6430e
author Mukesh Agrawal <quiche@google.com> 1475796963 +0000
committer android-build-merger <android-build-merger@google.com> 1475796963 +0000

Merge "Add wifilogd to generic image" am: c278a63560 am: bc7a9d2dd4 am: 7122eb3f3c
am: d988cb11b5

Change-Id: Ic731e980b4b13e6f0ce62bada9e9cc6a77052eee