diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2015-05-18 14:17:51 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2015-05-18 14:17:51 -0700 |
| commit | 05f803377ebcf2f9c6160fa125948598f0558113 (patch) | |
| tree | 137fd61b6419fa191a1940d53135db2dad7a7f07 /docs/html/images | |
| parent | 855d5495ffbd9d0e2dfbd22def462247a1a4e61b (diff) | |
| parent | ab6d5376048b72f40d978751d884e74f7ee90d31 (diff) | |
| download | frameworks_base-05f803377ebcf2f9c6160fa125948598f0558113.zip frameworks_base-05f803377ebcf2f9c6160fa125948598f0558113.tar.gz frameworks_base-05f803377ebcf2f9c6160fa125948598f0558113.tar.bz2 | |
resolved conflicts for merge of ab6d5376 to mnc-dev
Change-Id: Ice8e511bffa6a0bc3aec9e44c059a7dfde91d65f
Diffstat (limited to 'docs/html/images')
16 files changed, 0 insertions, 0 deletions
diff --git a/docs/html/images/cards/card-analytics_2x.png b/docs/html/images/cards/card-analytics_2x.png Binary files differnew file mode 100644 index 0000000..da62659 --- /dev/null +++ b/docs/html/images/cards/card-analytics_2x.png diff --git a/docs/html/images/cards/card-android-work_2x.png b/docs/html/images/cards/card-android-work_2x.png Binary files differnew file mode 100644 index 0000000..ac8b928 --- /dev/null +++ b/docs/html/images/cards/card-android-work_2x.png diff --git a/docs/html/images/cards/card-youtube_2x.png b/docs/html/images/cards/card-youtube_2x.png Binary files differnew file mode 100644 index 0000000..28bdd89 --- /dev/null +++ b/docs/html/images/cards/card-youtube_2x.png diff --git a/docs/html/images/distribute/android-work.jpg b/docs/html/images/distribute/android-work.jpg Binary files differnew file mode 100644 index 0000000..91f742b --- /dev/null +++ b/docs/html/images/distribute/android-work.jpg diff --git a/docs/html/images/distribute/gpfw_business.png b/docs/html/images/distribute/gpfw_business.png Binary files differnew file mode 100644 index 0000000..d395b4e --- /dev/null +++ b/docs/html/images/distribute/gpfw_business.png diff --git a/docs/html/images/distribute/gpfw_developer.png b/docs/html/images/distribute/gpfw_developer.png Binary files differnew file mode 100644 index 0000000..c0f0d26 --- /dev/null +++ b/docs/html/images/distribute/gpfw_developer.png diff --git a/docs/html/images/distribute/house-ads.png b/docs/html/images/distribute/house-ads.png Binary files differnew file mode 100644 index 0000000..f4df870 --- /dev/null +++ b/docs/html/images/distribute/house-ads.png diff --git a/docs/html/images/distribute/ota-installs.gif b/docs/html/images/distribute/ota-installs.gif Binary files differnew file mode 100644 index 0000000..85e40da --- /dev/null +++ b/docs/html/images/distribute/ota-installs.gif diff --git a/docs/html/images/distribute/signin-apps.png b/docs/html/images/distribute/signin-apps.png Binary files differnew file mode 100644 index 0000000..9891acd --- /dev/null +++ b/docs/html/images/distribute/signin-apps.png diff --git a/docs/html/images/distribute/signin-seamless.png b/docs/html/images/distribute/signin-seamless.png Binary files differnew file mode 100644 index 0000000..01b9d73 --- /dev/null +++ b/docs/html/images/distribute/signin-seamless.png diff --git a/docs/html/images/distribute/signin-secure.png b/docs/html/images/distribute/signin-secure.png Binary files differnew file mode 100644 index 0000000..3baad23 --- /dev/null +++ b/docs/html/images/distribute/signin-secure.png diff --git a/docs/html/images/distribute/youtube-card-example.png b/docs/html/images/distribute/youtube-card-example.png Binary files differnew file mode 100644 index 0000000..e5d77f9 --- /dev/null +++ b/docs/html/images/distribute/youtube-card-example.png diff --git a/docs/html/images/play_dev.jpg b/docs/html/images/play_dev.jpg Binary files differindex 6aae165..92513b7 100644 --- a/docs/html/images/play_dev.jpg +++ b/docs/html/images/play_dev.jpg diff --git a/docs/html/images/play_dev_old.jpg b/docs/html/images/play_dev_old.jpg Binary files differnew file mode 100644 index 0000000..6aae165 --- /dev/null +++ b/docs/html/images/play_dev_old.jpg diff --git a/docs/html/images/versions/notification-headsup.png b/docs/html/images/versions/notification-headsup.png Binary files differindex 7c374c8..623b225 100644 --- a/docs/html/images/versions/notification-headsup.png +++ b/docs/html/images/versions/notification-headsup.png diff --git a/docs/html/images/versions/rivalknights.png b/docs/html/images/versions/rivalknights.png Binary files differindex 6b467ef..6137fc4 100644 --- a/docs/html/images/versions/rivalknights.png +++ b/docs/html/images/versions/rivalknights.png |
