summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2015-07-24 00:46:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-24 00:46:15 +0000
commit7b9968538b122225bb321de9995a8f55d3de4455 (patch)
tree0e9e02691fc48537cbdf4b823df338136402436f /api
parent6b66a4a8a342b8156f73d83771caa1db2f866529 (diff)
parentcab361c9bbde051cdfb62afc5bc03ba3d6ee2217 (diff)
downloadframeworks_base-7b9968538b122225bb321de9995a8f55d3de4455.zip
frameworks_base-7b9968538b122225bb321de9995a8f55d3de4455.tar.gz
frameworks_base-7b9968538b122225bb321de9995a8f55d3de4455.tar.bz2
Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev
Diffstat (limited to 'api')
0 files changed, 0 insertions, 0 deletions