OSDN Git Service

Merge "Fix broken test due to API rename" am: 0abc93177f
authornharold <nharold@google.com>
Thu, 14 Dec 2017 23:28:16 +0000 (23:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Dec 2017 23:28:16 +0000 (23:28 +0000)
am: ee898c81a7

Change-Id: I7e99991cd2c71c66e1acb3aa3957efb28c9a426a


Trivial merge