OSDN Git Service

Merge "docs: Add note to getFrameAtTime() pointing to getScaledFrameAtTime()" into...
authorAndrew Solovay <asolovay@google.com>
Fri, 1 Dec 2017 19:29:13 +0000 (19:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Dec 2017 19:29:13 +0000 (19:29 +0000)
commitdd71b1bc611e4940e57d23b413e847fa4edfd170
treee9a133628c8551a963fb21b2df8cf9d40cbf2d5c
parentc0c7c3bcbb4d9cb5ca560c981814c9c97e27f2a6
parent284259a6331b686dc93aa73cb84e4ff7e03afac5
Merge "docs: Add note to getFrameAtTime() pointing to getScaledFrameAtTime()" into oc-mr1-dev
am: 284259a633

Change-Id: Ic8c9f91f1fc1e6c32bae90d8bf8fbe6b91beb712