OSDN Git Service

Merge "Fix Transition test failure." into oc-mr1-dev am: dbd11d6c8b
authorGeorge Mount <mount@google.com>
Mon, 2 Oct 2017 21:37:16 +0000 (21:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Oct 2017 21:37:16 +0000 (21:37 +0000)
am: 8e8e3eff08

Change-Id: Ifbffc328d5d356f77d668deb7104d7d73fc28bf2


Trivial merge