tree a3ca579f7ef690cff2e544e134056b3239d3875b
parent 8ce50255c54ccb25d93263afbd76edec55c00d80
parent 51cb82652908d9e16b2bc9a70219160fe891b1e8
author TreeHugger Robot <treehugger-gerrit@google.com> 1502140854 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502140854 +0000

Merge "media: Address api council comments." into oc-mr1-dev