summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Sloager <rslogar@google.com>2015-02-18 00:18:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-18 00:18:01 +0000
commit3a69c24fcaa01f276b5a77e05487f9614c3ae246 (patch)
tree6a683a4d66660b10b4ceac3a98676ea19afdf71c
parent6de1fd98f73b94c8bd5508b3e3d419d0b5d19621 (diff)
parentdcf68e83d6868abb6334c7a1881724f04929e87c (diff)
downloadframeworks_base-3a69c24fcaa01f276b5a77e05487f9614c3ae246.zip
frameworks_base-3a69c24fcaa01f276b5a77e05487f9614c3ae246.tar.gz
frameworks_base-3a69c24fcaa01f276b5a77e05487f9614c3ae246.tar.bz2
am dcf68e83: am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge: d225cfc
* commit 'dcf68e83d6868abb6334c7a1881724f04929e87c': Revert "docs: studio proxy setup"
-rw-r--r--docs/html/images/tools/studio-inspection-scope.png0
-rw-r--r--docs/html/images/tools/studio-inspections-config.png0
2 files changed, 0 insertions, 0 deletions
diff --git a/docs/html/images/tools/studio-inspection-scope.png b/docs/html/images/tools/studio-inspection-scope.png
deleted file mode 100644
index e69de29..0000000
--- a/docs/html/images/tools/studio-inspection-scope.png
+++ /dev/null
diff --git a/docs/html/images/tools/studio-inspections-config.png b/docs/html/images/tools/studio-inspections-config.png
deleted file mode 100644
index e69de29..0000000
--- a/docs/html/images/tools/studio-inspections-config.png
+++ /dev/null