tree 2ec8cd549d2d07ffeae4b6ea106c427cd07adaf6
parent 1427bb3dc0b4a710ec17b5a065db3980bea70676
parent b28b99a4257f2ef6d747cc8dc4d60a23cc69e0eb
author TreeHugger Robot <treehugger-gerrit@google.com> 1466717132 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1466717133 +0000

Merge "media: update getAchievableFrameRatesFor javadoc" into nyc-dev