summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorDavid Friedman <dmail@google.com>2014-12-05 23:27:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-05 23:27:27 +0000
commit968ef51c679105df4770a2d04b506a7f5ffacaf8 (patch)
tree2db668953cb9f32646a46c895b9e53e5f27b4c1e /media
parentd386d0f391c41e3e6e87abab44600df24f45ac4a (diff)
parentc305e6eb4aacf08001241ce18e0a86ba369fd421 (diff)
downloadframeworks_base-968ef51c679105df4770a2d04b506a7f5ffacaf8.zip
frameworks_base-968ef51c679105df4770a2d04b506a7f5ffacaf8.tar.gz
frameworks_base-968ef51c679105df4770a2d04b506a7f5ffacaf8.tar.bz2
am c305e6eb: am 860bdc7d: am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs
* commit 'c305e6eb4aacf08001241ce18e0a86ba369fd421': Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions