OSDN Git Service

Merge "Fix cts." into pi-dev
authorYi Jin <jinyithu@google.com>
Thu, 7 Jun 2018 17:06:54 +0000 (10:06 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Jun 2018 17:06:54 +0000 (10:06 -0700)
am: 3e389a8490

Change-Id: I77fcff1e83f33859e0b0cb65a29bfa40827749a9


Trivial merge