tree bef71ab4cad47a18b1bc0561e755b26245f2a20a
parent c423836b0831a67ad94b17bcb1ee0ee4d283c747
parent a81d64e9407a849ff66419cfe4c28854a6c7c656
author Sasha Smundak <asmundak@google.com> 1550601136 -0800
committer android-build-merger <android-build-merger@google.com> 1550601136 -0800

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

Change-Id: I8202195e94c616d8b09e76aa01f4d74f098afd3e