resolved conflicts for merge of b08447ba to klp-ub-dev

Change-Id: I77406f89d3b499f831ba4a66b7bf79039838c5b2
2013-11-06 15:42:01 -08:00
parent baba771c85 b08447ba51
commit 1ae704b87e
16 changed files with 1 additions and 1 deletions
--- 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 -->
--- a/docs/html/images/kk-captions-n5.png
+++ b/docs/html/images/kk-captions-n5.png
--- a/docs/html/images/kk-home-crop.png
+++ b/docs/html/images/kk-home-crop.png
--- a/docs/html/images/kk-home-crop2.png
+++ b/docs/html/images/kk-home-crop2.png
--- a/docs/html/images/kk-home.png
+++ b/docs/html/images/kk-home.png
--- a/docs/html/images/kk-immersive-pacras.png
+++ b/docs/html/images/kk-immersive-pacras.png
--- a/docs/html/images/kk-moves-logo.png
+++ b/docs/html/images/kk-moves-logo.png
--- a/docs/html/images/kk-moves-n5.png
+++ b/docs/html/images/kk-moves-n5.png
--- a/docs/html/images/kk-print-land-n5.png
+++ b/docs/html/images/kk-print-land-n5.png
--- a/docs/html/images/kk-print-port-new.png
+++ b/docs/html/images/kk-print-port-new.png
--- a/docs/html/images/kk-proc-device-detail.png
+++ b/docs/html/images/kk-proc-device-detail.png
--- a/docs/html/images/kk-proc-device-overview-tri.png
+++ b/docs/html/images/kk-proc-device-overview-tri.png
--- a/docs/html/images/kk-proc-device-overview.png
+++ b/docs/html/images/kk-proc-device-overview.png
--- a/docs/html/images/kk-runtastic-logo.png
+++ b/docs/html/images/kk-runtastic-logo.png
--- a/docs/html/images/kk-saf1-n5.png
+++ b/docs/html/images/kk-saf1-n5.png
--- a/docs/html/images/kk-saf2-n5.png
+++ b/docs/html/images/kk-saf2-n5.png