tree 47e2325d31971b167132ca762dadc2283402800a
parent 6adbc2c98255cd063b44572c898f21477e7946f2
parent b2ee79101bc366a25c7dcc995a099e8fc5fd952e
author Mark Salyzyn <salyzyn@google.com> 1476110472 +0000
committer android-build-merger <android-build-merger@google.com> 1476110472 +0000

Merge "No longer need android/log.h" am: b330559fb6 am: 7bf11aadfd am: 5ceada5bea
am: b2ee79101b

Change-Id: Ie1a96c43737fb4b78d79cbb28a0d43ad3bfba6e6