OSDN Git Service

Merge "Expose animator settings to Instant Apps" into oc-dev
authorChad Brubaker <cbrubaker@google.com>
Tue, 4 Apr 2017 00:31:01 +0000 (00:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 00:31:01 +0000 (00:31 +0000)
am: d490fe0372

Change-Id: I3a88cc331949e987462aca315e7f396d5491147b


Trivial merge