tree 66b1e4771c72c67e633ca0910e9f6ffcf24be262
parent eef3fee614726f9e552d80b9a36e232621c3da33
parent a2b4a33c844c0aef711781c3235cc59c28e9e4d5
author Sasha Smundak <asmundak@google.com> 1547062587 -0800
committer android-build-merger <android-build-merger@google.com> 1547062587 -0800

Merge "Convert Android.mk file to Android.bp"
am: a2b4a33c84

Change-Id: Iffc1a113d033ae469854af705ee6c2472828cd81