tree b9360b1ec212027a08728a47e013d355bbe648ef
parent 3dade0f9b8323b5716de8291401f6d5a54b4c8ae
parent 6a9fb19b0fab321ab742dfc96149d9279573437f
author Tao Bao <tbao@google.com> 1534356785 -0700
committer android-build-merger <android-build-merger@google.com> 1534356785 -0700

Merge "tests: Move to Android.bp." am: b1ff1bc43b am: 6956957499
am: 6a9fb19b0f

Change-Id: I6e2da6cef5a004b9968c9cdf272fb1f81089c94e