OSDN Git Service

Merge "Remove libservicestestsjni" am: d00478e9ad am: 301c714b43 am: dcb0c55c15
authorColin Cross <ccross@android.com>
Thu, 12 Jan 2017 05:16:47 +0000 (05:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Jan 2017 05:16:47 +0000 (05:16 +0000)
am: 9d273bfec1  -s ours

Change-Id: I2c890897639f807e8f8cdd2217d6f3cf13833b4e


Trivial merge