OSDN Git Service

Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev
authorDoris Liu <tianliu@google.com>
Wed, 7 Jun 2017 03:49:44 +0000 (03:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Jun 2017 03:49:44 +0000 (03:49 +0000)
am: 8d06d8cbf1

Change-Id: I3e8680067b360ed5792f9a9d1be953561fca7969


Trivial merge