summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-11-06 17:03:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-06 17:03:00 +0000
commit58dc8c42f2880b4264bfad46b9ab443576d4b4f2 (patch)
tree29dcc7553cb4b95afb677e4bb2981196a6544e54 /media
parent6209d4e4d8a8662628c53cd5e1944abf30293d87 (diff)
parente7cd5f2e9cf76ed789534dfe5cc60c27a3b4984f (diff)
downloadframeworks_base-58dc8c42f2880b4264bfad46b9ab443576d4b4f2.zip
frameworks_base-58dc8c42f2880b4264bfad46b9ab443576d4b4f2.tar.gz
frameworks_base-58dc8c42f2880b4264bfad46b9ab443576d4b4f2.tar.bz2
am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs
* commit 'e7cd5f2e9cf76ed789534dfe5cc60c27a3b4984f': docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions