tree 648f2c96748af66f3df5ba40da1b7d5b7e46b306
parent 94e23b0469e9c6a6cc7241b3982874a4d9bc7c9e
parent d85091b9ebb662538566cb7ba8e46c1f9c11084f
author Dimitry Ivanov <dimitry@google.com> 1557484749 -0700
committer android-build-merger <android-build-merger@google.com> 1557484749 -0700

Merge "Filter out .native_bridge static libs from NOTICE files" am: 62ae23267f
am: d85091b9eb

Change-Id: I3647089bea282929158f2f1e51e13a87dabbf86c