tree a8739f846ee9b52e906a2d0224b443aebefd735a
parent dbda419424a76678a7af3bde8cf955193a916fe7
parent 937e8b891de2166dea05401b3cd4d24a8e6440f5
author Dan Willemsen <dwillemsen@google.com> 1469578323 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1469578323 +0000

Merge "Convert Android.mk to Android.bp"