tree f0e411c6d18d77c327031ff9e5d406231ddd4203
parent 49f3624a6d3307b640a012f15b94d04174473501
parent 90ad95da1e48f40634e5a7a09c8dd0c26f673c99
author Sasha Smundak <asmundak@google.com> 1547594508 -0800
committer android-build-merger <android-build-merger@google.com> 1547594508 -0800

Merge "Convert Android.mk file to Android.bp" am: 4e06707a71 am: 224ed80629
am: 90ad95da1e

Change-Id: I878631df15c1ce001d66edf397d1570d35000193