tree c0e2425cbba8779f4274342a5795df9a6bcbabb6
parent d8dc9b66b9ae3f465ffd7ea597cef79f10cf7c1a
parent d544b318fbfbf479b62cbe87802fcd23eb2845ab
author Mark Salyzyn <salyzyn@google.com> 1502321536 +0000
committer android-build-merger <android-build-merger@google.com> 1502321536 +0000

Merge "logcat: transition to Android.bp" am: ad7f1bc0b3 am: b5a69e8e70
am: d544b318fb

Change-Id: I93f6add52dd6bdff30e8bc5709deded1b6e1ef14