tree 640f171dc0373c4637ca42ab95b5621dc36a4272
parent 96dad7e0a3404d1cb5cb8ec9256bb1254405e07e
parent d1be47c3e9af3c6814661a4a9b7ea3a37e36453a
author Andrew Solovay <asolovay@google.com> 1512155944 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1512155944 +0000

Merge "docs: Add note to getFrameAtTime() pointing to getScaledFrameAtTime()" into oc-mr1-dev