tree cc01a667837c818be0e54a9fade2d442c6605d1d
parent 9c0277f9e76271275925b13db5ebcf7584d29f98
parent 7ee95c3a50c149f0194ffc8c0f85d91760eeeca2
author Dan Willemsen <dwillemsen@google.com> 1470175577 +0000
committer android-build-merger <android-build-merger@google.com> 1470175577 +0000

Merge "Convert Android.mk to Android.bp"
am: 7ee95c3a50

Change-Id: I24f4b076a5d79b0671d70e6e3659c44e0782a1ef