OSDN Git Service

Merge "Fix broken test due to API rename"
authorNathan Harold <nharold@google.com>
Thu, 14 Dec 2017 23:14:57 +0000 (23:14 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 14 Dec 2017 23:14:57 +0000 (23:14 +0000)

Trivial merge