tree 474a6982fa5078f31bfdeb96590308dc83b5187a
parent 46998029d80d5e486940c3c6b641569229349641
parent 37d91651ea220920e3133563f8f5689203eb7b7c
author Jorge Lucangeli Obes <jorgelo@google.com> 1482965277 +0000
committer android-build-merger <android-build-merger@google.com> 1482965277 +0000

Merge "mtpd: Convert Android.mk to Android.bp" am: 4550f59821 am: beb79653f9
am: 37d91651ea

Change-Id: Ia0a715d5cc5f3296b7b3446b6188424fdb79810e