tree cc6d9af10e2b592a0f41f1e625506d73183b8b03
parent 09ab9a68387bb17b998c42cf1e45dfeab7f70fa3
parent 7bf11aadfd47b44c4eba6cdfed347ce03b859db9
author Mark Salyzyn <salyzyn@google.com> 1476109530 +0000
committer android-build-merger <android-build-merger@google.com> 1476109530 +0000

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

Change-Id: I2399e35aacb6703aedf21bf352f47638720b7d1a