tree 95d3669f7eaa3ed762cf8c233f5504d514c4f8d5
parent 8e0c8c0decc92fc9a128a66f4f89aa584a43c9c2
parent 6684ec8d97bcb65579c7f2f214b1a1d7639e4698
author Chenjie Luo <cjluo@google.com> 1488855173 +0000
committer android-build-merger <android-build-merger@google.com> 1488855173 +0000

Merge "Define _LOG as a weak symbol."
am: 6684ec8d97

Change-Id: Ibb3804ff53490abd2743ce8ba33c6833ac2a71ab