OSDN Git Service

Merge \\\"Fix test after rename.\\\" am: 522da11a6c am: c8f60fd364
authorNicolas Geoffray <ngeoffray@google.com>
Wed, 20 Jul 2016 11:05:47 +0000 (11:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jul 2016 11:05:47 +0000 (11:05 +0000)
am: 1fb5373e10

Change-Id: I043ecb79c93d74023c21432e6aa3ace920fc24fa


Trivial merge