tree 8658f89250821c15ed1f45169f7dfcfa0e2ce4d1
parent 839f707a38ed15685da48bbd5f4458817b5a54c6
parent 506ebdf7f914544f4de7b55c2d296fb9ac07a8c7
author Dongwon Kang <dwkang@google.com> 1458690625 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1458690626 +0000

Merge "MediaResourceMonitor: Change argument type from string to int" into nyc-dev