OSDN Git Service

Merge "Mark CTS-tested APIs as @TestApi" into pi-dev
authorShawn Willden <swillden@google.com>
Wed, 11 Apr 2018 19:13:54 +0000 (12:13 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Apr 2018 19:13:54 +0000 (12:13 -0700)
am: 98831af78b

Change-Id: Ia2cd2684380aca372e912af9aeda343246df924e


Trivial merge