tree 706a65610cc67612d3d58758505d5274d5b1899f
parent 1d1367f0d89bb3936b9dfebee1df657c0cc5a069
parent c135cdbe7aee0ec80e2882b1aa5bc5b2adac93a5
author Sasha Smundak <asmundak@google.com> 1547509707 -0800
committer android-build-merger <android-build-merger@google.com> 1547509707 -0800

Merge "Convert Android.mk file to Android.bp" am: da44f9cf37 am: 56c2c6c8ca
am: c135cdbe7a

Change-Id: Id75aacff8001d0279233f949839a1502e6e1580e