tree d027427e27180d23d5208b39631ba62a29b29a87
parent 80336410edb3e32662c851686d8abb5c986744d9
parent 80a06a35e37f721a09fd66b32551ab8cdb65818f
author Steven Moreland <smoreland@google.com> 1480098377 +0000
committer android-build-merger <android-build-merger@google.com> 1480098377 +0000

Merge "Update makefiles for logging." am: 2fe5762cae am: 007e4f5516 am: 2a523150df
am: 80a06a35e3

Change-Id: I17ad0b71f001a3db89656743dc49680578e98a1a