tree 0b58f551214399aeabda9e029818d4c4e9d1049d
parent 390924d5da2d89177c5d7f71dfc83432e87ffb6a
parent 09f6be55ff0959a080283c4b9c5ff2fe59d56ce8
author James Dong <jdong@google.com> 1291586878 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1291586878 -0800

Merge "Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime()"