summaryrefslogtreecommitdiffstats
path: root/docs/html/develop
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-02-08 11:17:50 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-02-08 11:17:50 -0800
commit2e65e20c761f0fdee98eeefe9a8ee13c95a8b1ff (patch)
treecfc0778999b66020a45484b12f87214e62ef6472 /docs/html/develop
parentddc0a7bdf94f4ba84dd4b89b693eb148ff32b5d3 (diff)
parent9b8b4ae5d7a4f5fbe242f5a2da145fd0fa88ce87 (diff)
downloadframeworks_base-2e65e20c761f0fdee98eeefe9a8ee13c95a8b1ff.zip
frameworks_base-2e65e20c761f0fdee98eeefe9a8ee13c95a8b1ff.tar.gz
frameworks_base-2e65e20c761f0fdee98eeefe9a8ee13c95a8b1ff.tar.bz2
am 9b8b4ae5: am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android Git Automerger (2) and others * commit '9b8b4ae5d7a4f5fbe242f5a2da145fd0fa88ce87': Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Diffstat (limited to 'docs/html/develop')
0 files changed, 0 insertions, 0 deletions