Amith Yamasani
85c33f500a
Merge "Add CtsShimPrebuilt" into nyc-dev
2016-05-17 00:27:55 +00:00
Billy Lamberta
f06c24f0c1
docs: work minisite am: 09304b21b3
...
am: 05f772fe6b
* commit '05f772fe6bb53190477d6b92e8098d53994cfdbf':
docs: work minisite
Change-Id: Ifff07a8a5d6b5aa9011226ec8d512f5e800ff4df
2016-05-16 22:21:47 +00:00
Billy Lamberta
05f772fe6b
docs: work minisite
...
am: 09304b21b3
* commit '09304b21b33f13480d4df58b53df89e6e1356537':
docs: work minisite
Change-Id: I3ee5ddd408506dbdce2168e8aeaa3a1a87442005
2016-05-16 22:15:52 +00:00
Billy Lamberta
09304b21b3
docs: work minisite
...
Changes needed to build the new directory
frameworks/base/docs/html/work. Support for
resource cards and navigation.
bug: 27744376
Change-Id: I8556eb0e2cf86eb83be395a97306d220394827cd
2016-05-16 14:15:06 -07:00
Amith Yamasani
6f7873ca6f
Add CtsShimPrebuilt
...
It was needed for a CTS test but was accidentally
left out?
Bug: 28398205
Change-Id: I7deea60e6b11bc11d3bd8e82170fc42df7cec3c7
2016-05-16 12:43:43 -07:00
Alan Viverette
c608284d22
Merge "Add missing support library projects to pathmap" into mnc-ub-dev
...
am: 5b30101722
* commit '5b3010172211583034d1cf5eac41583dae79d77a':
Add missing support library projects to pathmap
Change-Id: Ia5c43c59bd4ff26a2d1069f38205ee7a5de2181b
2016-05-16 15:01:38 +00:00
Alan Viverette
5b30101722
Merge "Add missing support library projects to pathmap" into mnc-ub-dev
2016-05-16 14:56:01 +00:00
Joe Fernandez
f1ed84693e
docs: Wear Preview - update TOC navigation behavior am: f8e4e54b89
...
am: f9601a7ad2
* commit 'f9601a7ad261772cf0f89df267de6998fd65cc48':
docs: Wear Preview - update TOC navigation behavior
Change-Id: I4304642d26f0b975cb50bfdd53a04167d186b268
2016-05-16 01:13:40 +00:00
Joe Fernandez
f9601a7ad2
docs: Wear Preview - update TOC navigation behavior
...
am: f8e4e54b89
* commit 'f8e4e54b89cf381a725e8be9e05eee2bb94b0f2c':
docs: Wear Preview - update TOC navigation behavior
Change-Id: I9cbf81eec6b55a40d573c0160b7f7936bd0eb621
2016-05-16 01:10:52 +00:00
Joe Fernandez
f8e4e54b89
docs: Wear Preview - update TOC navigation behavior
...
b/28004352
Change-Id: I1818c7b0def80e5871a0e6abf0353e9216164e1f
2016-05-15 17:56:44 -07:00
Amanda Kassay
600ccf1185
Updated default.css and docs.js for DoD transition fallback. am: 4d5bcbf62a
am: 613cf217cf
...
am: 18840d1ecb
* commit '18840d1ecbeeb4691e61a5745757c56af95d87fc':
Updated default.css and docs.js for DoD transition fallback.
Change-Id: I2b1a4174aee4c85df917431135529798790fd8cf
2016-05-14 15:35:22 +00:00
Amanda Kassay
18840d1ecb
Updated default.css and docs.js for DoD transition fallback. am: 4d5bcbf62a
...
am: 613cf217cf
* commit '613cf217cf3f60cadd6235e0336df2e076588e3c':
Updated default.css and docs.js for DoD transition fallback.
Change-Id: I4025f00dd7958af44c2aa3475f3ac397246e55e6
2016-05-14 15:32:26 +00:00
Amanda Kassay
613cf217cf
Updated default.css and docs.js for DoD transition fallback.
...
am: 4d5bcbf62a
* commit '4d5bcbf62a0cc6ec1db0c860a818b6166dceed74':
Updated default.css and docs.js for DoD transition fallback.
Change-Id: I22a7466baee5d752542000565afb826eef06c96d
2016-05-14 15:29:30 +00:00
Stefan De Clercq
85ed2edec3
Add SDK 10 and 11 to list of supported Mac SDKs
...
Change-Id: Id558ef72e03626e3e577bc1a4f5ab85d6fe8efc5
2016-05-13 16:49:10 -07:00
Joe Fernandez
a067357b5a
docs: Instant Apps - enable TOC and navigation for navigation am: f38a01d800
...
am: 84a8735017
* commit '84a873501701f7846c09b4bff604e65c2c38a9bd':
docs: Instant Apps - enable TOC and navigation for navigation
Change-Id: I9b9974a0e180139dccea8867f3675473b95ba5be
2016-05-13 23:45:57 +00:00
Joe Fernandez
84a8735017
docs: Instant Apps - enable TOC and navigation for navigation
...
am: f38a01d800
* commit 'f38a01d800b05187db6515527df919a1a8dec6f5':
docs: Instant Apps - enable TOC and navigation for navigation
Change-Id: I1b05ae4d00f7ac446274978dc6f32fa98c804d81
2016-05-13 23:43:22 +00:00
Joe Fernandez
f38a01d800
docs: Instant Apps - enable TOC and navigation for navigation
...
Change-Id: I7a259da8618f090a8146d4f42608ebc8baf73af1
2016-05-13 16:15:22 -07:00
Tao Bao
fb9e214b8c
DO NOT MERGE rangelib.py: Fix the bug in monotonic check. am: 16536a53a0
am: 801dc8925f
...
am: cb5268ef2e
-s ours
* commit 'cb5268ef2e77073d76847eef6391683a3c288121':
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
Change-Id: Ic47389e443ebe2aa91953082dd47ed9119f2f5a6
2016-05-13 22:44:16 +00:00
Tao Bao
cb5268ef2e
DO NOT MERGE rangelib.py: Fix the bug in monotonic check. am: 16536a53a0
...
am: 801dc8925f
* commit '801dc8925fcc148f438ceca751b2c14a853bece7':
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
Change-Id: I98966afb7be0c91d4985985a5abd05fee05e0d8f
2016-05-13 22:41:42 +00:00
Tao Bao
801dc8925f
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
...
am: 16536a53a0
* commit '16536a53a057778240b1a3a923b5dde31b79bd90':
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
Change-Id: I07d7bf9a34dabd3646f341427d9f53a74e9e8fc9
2016-05-13 22:39:07 +00:00
Tao Bao
16536a53a0
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
...
RangeSet("2-10").monotonic gives a wrong result of "False". Fix the bug
and add more tests into test_rangelib.py.
Bug: 28760775
Change-Id: I04780571b45ecafd34040f405756b9745a9e21a5
(cherry picked from commit e8f756137c
)
2016-05-13 15:21:26 -07:00
Amanda Kassay
4d5bcbf62a
Updated default.css and docs.js for DoD transition fallback.
...
Change-Id: I0a978667b2ead38ba8dad8c90b173e9e91abd6f2
2016-05-13 16:04:44 -04:00
Tianjie Xu
f042baf4cc
Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev
...
am: b0c6b7d072
-s ours
* commit 'b0c6b7d0722917a66aa4338e4f2b258cd221a4be':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: I2b969467e56cc9c6197a181545276f75d5188bca
2016-05-13 18:18:57 +00:00
Alan Viverette
e5368fa373
Add documents-archive to SDK, docs builds
...
Bug: 28762753
Change-Id: I169adfb3124aac92cb3b96966667a2f8b4b78472
2016-05-13 14:17:33 -04:00
Alan Viverette
55e80ef5c4
Add missing support library projects to pathmap
...
Bug: 28716910
Change-Id: I8eab2d638b72d591e157958b7b043431263f4409
2016-05-13 14:15:25 -04:00
Tianjie Xu
fe740bacea
DO NOT MERGE Monotonic flag sets incorrectly in rangelib am: 8d11597558
am: 8ae473d182
...
am: 9e337ed21c
-s ours
* commit '9e337ed21ceb8c31aaafdae67ecaa1a7c7451a47':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: I810854509e0fadd4e96ccf5b69c8c17fd29f9226
2016-05-13 18:13:24 +00:00
Baligh Uddin
b0c6b7d072
Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev
2016-05-13 18:11:11 +00:00
Tianjie Xu
9e337ed21c
DO NOT MERGE Monotonic flag sets incorrectly in rangelib am: 8d11597558
...
am: 8ae473d182
* commit '8ae473d18280e25d010c040147393a3b1e3bbc75':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: Ibbed631ec32f00f026bdcf4af8a9a1213d87b4e5
2016-05-13 18:10:55 +00:00
Tianjie Xu
8ae473d182
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
...
am: 8d11597558
* commit '8d1159755849ffcc1bd5c0de2821a4f5fe4ea58d':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: Ie0180bab1d41d86d3d2c3f14501b51b50f74635e
2016-05-13 18:08:12 +00:00
Tianjie Xu
245c155394
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
...
After applying update_target_files_incr_ext4.sh, some files may end up
occupying unsorted block fragments. In one example, an apk file has the
block range [258768-259211,196604]. The monotonic flag in rangelib sets
incorrectly for this example and leads to a bad input file for imgdiff.
After fixing the flag, bsdiff is called instead of imgdiff and the
incremental OTA package generates successfully.
Bug: 28760775
Bug: 28053885
Change-Id: Ib841bf449ff6a29314fc4a1b8fba941a6dc532ac
(cherry picked from commit cd1e16a761
)
(cherry picked from commit 8d11597558
)
2016-05-13 18:08:00 +00:00
Tianjie Xu
8d11597558
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
...
After applying update_target_files_incr_ext4.sh, some files may end up
occupying unsorted block fragments. In one example, an apk file has the
block range [258768-259211,196604]. The monotonic flag in rangelib sets
incorrectly for this example and leads to a bad input file for imgdiff.
After fixing the flag, bsdiff is called instead of imgdiff and the
incremental OTA package generates successfully.
Bug: 28760775
Bug: 28053885
Change-Id: Ib841bf449ff6a29314fc4a1b8fba941a6dc532ac
(cherry picked from commit cd1e16a761
)
2016-05-13 10:49:02 -07:00
Baligh Uddin
53380a8386
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65
-s ours am: d28e7ea333
-s ours am: e038da17f3
-s ours am: e3b631a5d6
-s ours am: 7e806813bb
-s ours am: e20dd6dca2
-s ours
...
am: 63847c39a6
-s ours
* commit '63847c39a64e7ab0a5e8564d887864c02a7ba2a5':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I289fc7b1d9ef94d6a298cfbd64ee6f66e8790b64
2016-05-12 23:19:56 +00:00
Baligh Uddin
63847c39a6
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65
-s ours am: d28e7ea333
-s ours am: e038da17f3
-s ours am: e3b631a5d6
-s ours am: 7e806813bb
-s ours
...
am: e20dd6dca2
-s ours
* commit 'e20dd6dca20231b7e68f3a8874bccedc1e56c40f':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I7391006c948be8188b8b197c1e318b76a826155a
2016-05-12 23:17:37 +00:00
Baligh Uddin
e20dd6dca2
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65
-s ours am: d28e7ea333
-s ours am: e038da17f3
-s ours am: e3b631a5d6
-s ours
...
am: 7e806813bb
-s ours
* commit '7e806813bb0c3df85c69aaa78a21d0d5dac7e92b':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: Ic99ba9bb2041840402829b1d2e75684bfbeb66f2
2016-05-12 23:15:18 +00:00
Baligh Uddin
7e806813bb
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65
-s ours am: d28e7ea333
-s ours am: e038da17f3
-s ours
...
am: e3b631a5d6
-s ours
* commit 'e3b631a5d62923a381bf0ecb151a1ec9c584380c':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I7f17e328de62c50087bc6d2acf3d8c17f5fb541f
2016-05-12 23:12:59 +00:00
Baligh Uddin
e3b631a5d6
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65
-s ours am: d28e7ea333
-s ours
...
am: e038da17f3
-s ours
* commit 'e038da17f38eac01e6c971d9f5956ea701a341e2':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: Ice12c95006ab0b10fa2d2a6413925001249564d8
2016-05-12 23:10:35 +00:00
Baligh Uddin
e038da17f3
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65
-s ours
...
am: d28e7ea333
-s ours
* commit 'd28e7ea333986fe820f19f2b34dec074f3b8bc22':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I65fd87879662e05d3906d530d5cba3e0d313990c
2016-05-12 23:08:02 +00:00
Baligh Uddin
d28e7ea333
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
...
am: f193546d65
-s ours
* commit 'f193546d65d41d40bd0e24e9bfe443001a320d1a':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I3fe077a1b75e67963cfbcc7430912afd5143d418
2016-05-12 23:05:19 +00:00
Baligh Uddin
f193546d65
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
...
Bug: 23967152
Change-Id: I2e2f1ead28f51f549dafacfc7d1d1e65b0b84bc7
2016-05-12 15:55:26 -07:00
Ian Pedowitz
77df46efec
Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev
2016-05-12 18:58:17 +00:00
Amanda Kassay
b6a7250084
Removing commented out deprecated download links in sdkpage.cs am: eefc7d441c
am: 7387b5861b
...
am: 494e80cabc
* commit '494e80cabcec97f4052ca15bd1eb8968e7910c35':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I332c0b7c12686e868fe24404aecc8966cdcf6f5d
2016-05-12 18:32:29 +00:00
Amanda Kassay
494e80cabc
Removing commented out deprecated download links in sdkpage.cs am: eefc7d441c
...
am: 7387b5861b
* commit '7387b5861b61d22a0c2edffb10611284a6d8fa0b':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I40bb1b50cc1d49dd3113e8511b8fa744acdf27b5
2016-05-12 18:29:57 +00:00
Amanda Kassay
7387b5861b
Removing commented out deprecated download links in sdkpage.cs
...
am: eefc7d441c
* commit 'eefc7d441c2c3b235fdae71853921dffff6da755':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I95145f9fb614fc875fcffbccfa24f176160138f7
2016-05-12 18:27:28 +00:00
Amanda Kassay
eefc7d441c
Removing commented out deprecated download links in sdkpage.cs
...
Change-Id: Iad26e72120b110fa017821be887de0cd07b3889a
2016-05-12 14:17:41 -04:00
Ian Pedowitz
8313541c65
PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
...
Bug: 27150977
Change-Id: I0958ee2cc377c5640c616dab8f093323ffd76c29
2016-05-12 10:39:59 -07:00
Joe Fernandez
5b61e4cb61
docs: Wear Preview - TOC and Resource card fixes for DoDS am: 151592490e
...
am: 10719438d6
* commit '10719438d6faaa1fea500057e211b2d88faf6d74':
docs: Wear Preview - TOC and Resource card fixes for DoDS
Change-Id: If17971766425bc5fbba0e9860d611ea043d6b8dd
2016-05-12 06:34:58 +00:00
Joe Fernandez
10719438d6
docs: Wear Preview - TOC and Resource card fixes for DoDS
...
am: 151592490e
* commit '151592490e22253eeb5355bd2861c56c80ecf437':
docs: Wear Preview - TOC and Resource card fixes for DoDS
Change-Id: I2e8521069969baaa1696adbef2f4cb901b636fb9
2016-05-12 06:32:49 +00:00
Joe Fernandez
151592490e
docs: Wear Preview - TOC and Resource card fixes for DoDS
...
b/28004352
Change-Id: Iff222f71508c21e0b35a3d41c846c062755605cd
2016-05-11 23:07:26 -07:00
Baligh Uddin
1e516a7ecf
DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip. am: 16690162c3
-s ours
...
am: 1ae509ad7b
-s ours
* commit '1ae509ad7bd3efaea1e66292f25faa63d27e756d':
DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
Change-Id: I9bebf65953a49a48bfd17373d6fd4bc749a9e764
2016-05-11 23:42:40 +00:00
Baligh Uddin
1ae509ad7b
DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
...
am: 16690162c3
-s ours
* commit '16690162c3eac9a40824c400822cb7023414a75b':
DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
Change-Id: I299c80c92c58cd11f7f7914942728956c896cf50
2016-05-11 23:39:21 +00:00