summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2015-04-09 22:17:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-09 22:17:46 +0000
commit16af1b044e67370d9f7e44b1e0b60ced60a85ba9 (patch)
tree349da44779b876619b6e48071e677e1de685aab9 /include/media
parentfe62ea5d0616c9226b26b8139fa3a0396a776d88 (diff)
parent8571e647da1e9c2227d22034ba6462235273cb02 (diff)
downloadframeworks_native-16af1b044e67370d9f7e44b1e0b60ced60a85ba9.zip
frameworks_native-16af1b044e67370d9f7e44b1e0b60ced60a85ba9.tar.gz
frameworks_native-16af1b044e67370d9f7e44b1e0b60ced60a85ba9.tar.bz2
am 8571e647: am 997eb5dd: am 44a38d93: Merge "Start accepting volume UUIDs from framework."
* commit '8571e647da1e9c2227d22034ba6462235273cb02': Start accepting volume UUIDs from framework.
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions