tree 83579290c12daedf586c30539c218042338c4a07
parent c7a88ddaa77588f321b857fbc36261e1ab595e02
parent 10d953e9e6d1f33d37ce6801d6dcd2946f00821e
author Sasha Smundak <asmundak@google.com> 1547057772 -0800
committer android-build-merger <android-build-merger@google.com> 1547057772 -0800

Merge "Convert Android.mk file to Android.bp" am: 7c18b9609f
am: 10d953e9e6

Change-Id: I150cf4741128ab06e672f02207618946aaebd7cd