diff options
| author | Rich Slogar <rslogar@google.com> | 2015-04-30 14:20:12 -0700 |
|---|---|---|
| committer | Rich Slogar <rslogar@google.com> | 2015-04-30 14:20:12 -0700 |
| commit | 0820394f7e4ca089a4210f21ed427871d96c793e (patch) | |
| tree | 733500b67354f1fd924b9c3df823fe38ccd238dd /docs/html/images | |
| parent | 08b51bfe8532ab7eff38ad69ad46c251be5c2792 (diff) | |
| parent | edf44562b51610ced0bb0d4bc24adcfafcf74502 (diff) | |
| download | frameworks_base-0820394f7e4ca089a4210f21ed427871d96c793e.zip frameworks_base-0820394f7e4ca089a4210f21ed427871d96c793e.tar.gz frameworks_base-0820394f7e4ca089a4210f21ed427871d96c793e.tar.bz2 | |
resolved conflicts for merge of edf44562 to mnc-dev
Change-Id: I2df8255d12feed8c17b9c9f009453701cd412676
Diffstat (limited to 'docs/html/images')
| -rw-r--r-- | docs/html/images/tools/studio-add-icon.png | bin | 0 -> 265 bytes |
| -rw-r--r-- | docs/html/images/tools/studio-debug-settings-icon.png | bin | 0 -> 660 bytes |
| -rw-r--r-- | docs/html/images/tools/studio-inspections-config.png | bin | 104566 -> 92539 bytes |
| -rw-r--r-- | docs/html/images/tools/studio-memory-monitor.png | bin | 46138 -> 20762 bytes |
| -rw-r--r-- | docs/html/images/tools/studio-memory-monitor2x.png | bin | 0 -> 44133 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/docs/html/images/tools/studio-add-icon.png b/docs/html/images/tools/studio-add-icon.png Binary files differnew file mode 100644 index 0000000..3ff49f6 --- /dev/null +++ b/docs/html/images/tools/studio-add-icon.png diff --git a/docs/html/images/tools/studio-debug-settings-icon.png b/docs/html/images/tools/studio-debug-settings-icon.png Binary files differnew file mode 100644 index 0000000..ee9c7a1 --- /dev/null +++ b/docs/html/images/tools/studio-debug-settings-icon.png diff --git a/docs/html/images/tools/studio-inspections-config.png b/docs/html/images/tools/studio-inspections-config.png Binary files differindex e41afa1..15a5a5b 100644 --- a/docs/html/images/tools/studio-inspections-config.png +++ b/docs/html/images/tools/studio-inspections-config.png diff --git a/docs/html/images/tools/studio-memory-monitor.png b/docs/html/images/tools/studio-memory-monitor.png Binary files differindex 796daf0..58147b7 100644 --- a/docs/html/images/tools/studio-memory-monitor.png +++ b/docs/html/images/tools/studio-memory-monitor.png diff --git a/docs/html/images/tools/studio-memory-monitor2x.png b/docs/html/images/tools/studio-memory-monitor2x.png Binary files differnew file mode 100644 index 0000000..7c3d6c4 --- /dev/null +++ b/docs/html/images/tools/studio-memory-monitor2x.png |
