tree ca1a0012f81c02ef33f551385c18702e7d157c67
parent f720f0dbf8a48fcf7c9883d79141598ce4cf4dd5
parent fd7b5bf6d4fa6a85cf6ad79df8cd143e0e81f9d4
author Colin Cross <ccross@android.com> 1543382129 -0800
committer android-build-merger <android-build-merger@google.com> 1543382129 -0800

Merge "Convert frameworks/base/services/tests to Android.bp" am: 372fa2ed21
am: fd7b5bf6d4

Change-Id: Id260d1861807631341732a876a0f31514ccf9bf2