tree 5d31d70a9cef3951a55ef5fb75205b324cd3901f
parent d116310a14c59d3989137b3cd435808b58650f66
parent b2c0c112fb4c1d53eb1b76d7f3a27d1b7d1a1ff7
author Colin Cross <ccross@android.com> 1534556697 -0700
committer android-build-merger <android-build-merger@google.com> 1534556697 -0700

Merge "Convert frameworks-base-testutils to Android.bp" am: de2bfe1ddf
am: b2c0c112fb

Change-Id: If72d09c77083ab25f01e693eabb400df586bf42a