tree 53306f2c6a1d203f239b80993f8da3940869d0fb
parent 7cc356e351b52e841f2459ab311777ddb6e72afa
parent 7791beabae1c3b39ab53adfa2adc5d6d074fe363
author Mark Salyzyn <salyzyn@google.com> 1470754226 +0000
committer android-build-merger <android-build-merger@google.com> 1470754226 +0000

Merge "logd: klogd crash" am: e23e0914ff am: 5118d8f633
am: 73ded18d31

Change-Id: I6797f0120af2e933611374f63b29b480dd8b7ed7