OSDN Git Service

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

Change-Id: I75a3f96e0d6d7cf05bbd8eb0dae03d114ac76f3e