tree 71e23b50c9c376e28ee6a5e42ba70563c79c8d72
parent 8b6a886d60c3863ae737601ca430d19d1d5f214b
parent 2fe5762caea3136fc5e793cd187de1138b035d76
author Steven Moreland <smoreland@google.com> 1480097930 +0000
committer android-build-merger <android-build-merger@google.com> 1480097930 +0000

Merge "Update makefiles for logging."
am: 2fe5762cae

Change-Id: I2f85a37a4cb7178aecd48eb63ca6fa7e7d715917