diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-11-06 15:42:01 -0800 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2013-11-06 15:42:01 -0800 |
| commit | 1ae704b87efbcae9aff46776e27e72678f92ce42 (patch) | |
| tree | 1221820caa7fc3f0d6942d84c46b55c91fe0bdfe /docs/html | |
| parent | baba771c85ec4a8d56e07c0d963c663a99cfa0e3 (diff) | |
| parent | b08447ba51e17d02ca9173bb638c6b1c840ac3c4 (diff) | |
| download | frameworks_base-1ae704b87efbcae9aff46776e27e72678f92ce42.zip frameworks_base-1ae704b87efbcae9aff46776e27e72678f92ce42.tar.gz frameworks_base-1ae704b87efbcae9aff46776e27e72678f92ce42.tar.bz2 | |
resolved conflicts for merge of b08447ba to klp-ub-dev
Change-Id: I77406f89d3b499f831ba4a66b7bf79039838c5b2
Diffstat (limited to 'docs/html')
16 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/about/versions/kitkat.jd b/docs/html/about/versions/kitkat.jd index 92ebf65..44dcac0 100644 --- a/docs/html/about/versions/kitkat.jd +++ b/docs/html/about/versions/kitkat.jd @@ -1169,4 +1169,4 @@ window.onhashchange = function () { performance, especially when running on a device with low RAM. </p> -</div><!-- END ANDROID 4.4 --> +</div><!-- END ANDROID 4.4 -->
\ No newline at end of file diff --git a/docs/html/images/kk-captions-n5.png b/docs/html/images/kk-captions-n5.png Binary files differdeleted file mode 100644 index f38c648..0000000 --- a/docs/html/images/kk-captions-n5.png +++ /dev/null diff --git a/docs/html/images/kk-home-crop.png b/docs/html/images/kk-home-crop.png Binary files differdeleted file mode 100644 index f609397..0000000 --- a/docs/html/images/kk-home-crop.png +++ /dev/null diff --git a/docs/html/images/kk-home-crop2.png b/docs/html/images/kk-home-crop2.png Binary files differdeleted file mode 100644 index 70894aa..0000000 --- a/docs/html/images/kk-home-crop2.png +++ /dev/null diff --git a/docs/html/images/kk-home.png b/docs/html/images/kk-home.png Binary files differdeleted file mode 100644 index fda311a..0000000 --- a/docs/html/images/kk-home.png +++ /dev/null diff --git a/docs/html/images/kk-immersive-pacras.png b/docs/html/images/kk-immersive-pacras.png Binary files differdeleted file mode 100644 index 9fcfbf8..0000000 --- a/docs/html/images/kk-immersive-pacras.png +++ /dev/null diff --git a/docs/html/images/kk-moves-logo.png b/docs/html/images/kk-moves-logo.png Binary files differdeleted file mode 100644 index e9b598d..0000000 --- a/docs/html/images/kk-moves-logo.png +++ /dev/null diff --git a/docs/html/images/kk-moves-n5.png b/docs/html/images/kk-moves-n5.png Binary files differdeleted file mode 100644 index 2258334..0000000 --- a/docs/html/images/kk-moves-n5.png +++ /dev/null diff --git a/docs/html/images/kk-print-land-n5.png b/docs/html/images/kk-print-land-n5.png Binary files differdeleted file mode 100644 index a48e57d..0000000 --- a/docs/html/images/kk-print-land-n5.png +++ /dev/null diff --git a/docs/html/images/kk-print-port-new.png b/docs/html/images/kk-print-port-new.png Binary files differdeleted file mode 100644 index 49ba657..0000000 --- a/docs/html/images/kk-print-port-new.png +++ /dev/null diff --git a/docs/html/images/kk-proc-device-detail.png b/docs/html/images/kk-proc-device-detail.png Binary files differdeleted file mode 100644 index 3769d93..0000000 --- a/docs/html/images/kk-proc-device-detail.png +++ /dev/null diff --git a/docs/html/images/kk-proc-device-overview-tri.png b/docs/html/images/kk-proc-device-overview-tri.png Binary files differdeleted file mode 100644 index 54e1156..0000000 --- a/docs/html/images/kk-proc-device-overview-tri.png +++ /dev/null diff --git a/docs/html/images/kk-proc-device-overview.png b/docs/html/images/kk-proc-device-overview.png Binary files differdeleted file mode 100644 index 0fbb33a..0000000 --- a/docs/html/images/kk-proc-device-overview.png +++ /dev/null diff --git a/docs/html/images/kk-runtastic-logo.png b/docs/html/images/kk-runtastic-logo.png Binary files differdeleted file mode 100644 index b161be5..0000000 --- a/docs/html/images/kk-runtastic-logo.png +++ /dev/null diff --git a/docs/html/images/kk-saf1-n5.png b/docs/html/images/kk-saf1-n5.png Binary files differdeleted file mode 100644 index 7693f18..0000000 --- a/docs/html/images/kk-saf1-n5.png +++ /dev/null diff --git a/docs/html/images/kk-saf2-n5.png b/docs/html/images/kk-saf2-n5.png Binary files differdeleted file mode 100644 index 21d7b9d..0000000 --- a/docs/html/images/kk-saf2-n5.png +++ /dev/null |
