summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-05-30 23:14:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-30 23:14:55 +0000
commita6716aade1d7bf0a60457d80da6aa85bc1006f57 (patch)
tree5b1277d72f70a5a4f6c4ef82b11257fd30ee0a4e /core/java
parent283c907a6a84c5d9ffe38d3468e76131e6917105 (diff)
parent8c5d0f2120d2006aa2115105b7c6dbf0b86058ae (diff)
downloadframeworks_base-a6716aade1d7bf0a60457d80da6aa85bc1006f57.zip
frameworks_base-a6716aade1d7bf0a60457d80da6aa85bc1006f57.tar.gz
frameworks_base-a6716aade1d7bf0a60457d80da6aa85bc1006f57.tar.bz2
Merge changes I1fd178b6,I5093672e into lmp-preview-dev
* changes: DO NOT MERGE: media.MediaCodec: hide NotificationCallback listener media.MediaCodec: document and fix-up setNotificationCallback
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions