OSDN Git Service
The Android Automerger [Tue, 17 May 2016 07:02:37 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Amith Yamasani [Tue, 17 May 2016 00:27:54 +0000 (00:27 +0000)]
Merge "Add CtsShimPrebuilt" into nyc-dev
Billy Lamberta [Mon, 16 May 2016 22:21:47 +0000 (22:21 +0000)]
docs: work minisite am:
09304b21b3
am:
05f772fe6b
* commit '
05f772fe6bb53190477d6b92e8098d53994cfdbf':
docs: work minisite
Change-Id: Ifff07a8a5d6b5aa9011226ec8d512f5e800ff4df
Billy Lamberta [Mon, 16 May 2016 22:15:52 +0000 (22:15 +0000)]
docs: work minisite
am:
09304b21b3
* commit '
09304b21b33f13480d4df58b53df89e6e1356537':
docs: work minisite
Change-Id: I3ee5ddd408506dbdce2168e8aeaa3a1a87442005
Billy Lamberta [Tue, 3 May 2016 22:28:41 +0000 (15:28 -0700)]
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
The Android Automerger [Mon, 16 May 2016 20:13:51 +0000 (13:13 -0700)]
"NRD46B"
Amith Yamasani [Fri, 13 May 2016 18:25:07 +0000 (11:25 -0700)]
Add CtsShimPrebuilt
It was needed for a CTS test but was accidentally
left out?
Bug:
28398205
Change-Id: I7deea60e6b11bc11d3bd8e82170fc42df7cec3c7
Alan Viverette [Mon, 16 May 2016 15:01:38 +0000 (15:01 +0000)]
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
Alan Viverette [Mon, 16 May 2016 14:56:01 +0000 (14:56 +0000)]
Merge "Add missing support library projects to pathmap" into mnc-ub-dev
The Android Automerger [Mon, 16 May 2016 07:03:27 +0000 (00:03 -0700)]
"NRD46"
The Android Automerger [Mon, 16 May 2016 07:02:15 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Joe Fernandez [Mon, 16 May 2016 01:13:40 +0000 (01:13 +0000)]
docs: Wear Preview - update TOC navigation behavior am:
f8e4e54b89
am:
f9601a7ad2
* commit '
f9601a7ad261772cf0f89df267de6998fd65cc48':
docs: Wear Preview - update TOC navigation behavior
Change-Id: I4304642d26f0b975cb50bfdd53a04167d186b268
Joe Fernandez [Mon, 16 May 2016 01:10:52 +0000 (01:10 +0000)]
docs: Wear Preview - update TOC navigation behavior
am:
f8e4e54b89
* commit '
f8e4e54b89cf381a725e8be9e05eee2bb94b0f2c':
docs: Wear Preview - update TOC navigation behavior
Change-Id: I9cbf81eec6b55a40d573c0160b7f7936bd0eb621
Joe Fernandez [Mon, 16 May 2016 00:55:44 +0000 (17:55 -0700)]
docs: Wear Preview - update TOC navigation behavior
b/
28004352
Change-Id: I1818c7b0def80e5871a0e6abf0353e9216164e1f
The Android Automerger [Sun, 15 May 2016 08:56:40 +0000 (01:56 -0700)]
"NRD45B"
The Android Automerger [Sun, 15 May 2016 08:55:27 +0000 (01:55 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 15 May 2016 00:06:38 +0000 (00:06 +0000)]
"NRD45"
The Android Automerger [Sun, 15 May 2016 00:02:43 +0000 (00:02 +0000)]
merge in nyc-release history after reset to nyc-dev
Amanda Kassay [Sat, 14 May 2016 15:35:22 +0000 (15:35 +0000)]
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
Amanda Kassay [Sat, 14 May 2016 15:32:26 +0000 (15:32 +0000)]
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
Amanda Kassay [Sat, 14 May 2016 15:29:30 +0000 (15:29 +0000)]
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
Joe Fernandez [Fri, 13 May 2016 23:45:57 +0000 (23:45 +0000)]
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
Joe Fernandez [Fri, 13 May 2016 23:43:22 +0000 (23:43 +0000)]
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
Joe Fernandez [Fri, 13 May 2016 22:43:25 +0000 (15:43 -0700)]
docs: Instant Apps - enable TOC and navigation for navigation
Change-Id: I7a259da8618f090a8146d4f42608ebc8baf73af1
Tao Bao [Fri, 13 May 2016 22:44:16 +0000 (22:44 +0000)]
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
Tao Bao [Fri, 13 May 2016 22:41:42 +0000 (22:41 +0000)]
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
Tao Bao [Fri, 13 May 2016 22:39:07 +0000 (22:39 +0000)]
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
Tao Bao [Thu, 27 Aug 2015 00:07:14 +0000 (17:07 -0700)]
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
e8f756137c39fc3292014f2eab5f84c6e5135797)
Amanda Kassay [Fri, 13 May 2016 16:24:39 +0000 (12:24 -0400)]
Updated default.css and docs.js for DoD transition fallback.
Change-Id: I0a978667b2ead38ba8dad8c90b173e9e91abd6f2
The Android Automerger [Fri, 13 May 2016 18:32:32 +0000 (11:32 -0700)]
"NRD42E"
Tianjie Xu [Fri, 13 May 2016 18:18:57 +0000 (18:18 +0000)]
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
Alan Viverette [Fri, 13 May 2016 18:15:25 +0000 (14:15 -0400)]
Add missing support library projects to pathmap
Bug:
28716910
Change-Id: I8eab2d638b72d591e157958b7b043431263f4409
Tianjie Xu [Fri, 13 May 2016 18:13:24 +0000 (18:13 +0000)]
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
Baligh Uddin [Fri, 13 May 2016 18:11:11 +0000 (18:11 +0000)]
Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev
Tianjie Xu [Fri, 13 May 2016 18:10:55 +0000 (18:10 +0000)]
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
Tianjie Xu [Fri, 13 May 2016 18:08:12 +0000 (18:08 +0000)]
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
Tianjie Xu [Fri, 8 Apr 2016 03:17:48 +0000 (20:17 -0700)]
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
cd1e16a7616092e5a315b0a421a0c082da144145)
(cherry picked from commit
8d1159755849ffcc1bd5c0de2821a4f5fe4ea58d)
Tianjie Xu [Fri, 8 Apr 2016 03:17:48 +0000 (20:17 -0700)]
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
cd1e16a7616092e5a315b0a421a0c082da144145)
The Android Automerger [Fri, 13 May 2016 00:00:15 +0000 (17:00 -0700)]
"NRD42D"
Baligh Uddin [Thu, 12 May 2016 23:19:56 +0000 (23:19 +0000)]
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
Baligh Uddin [Thu, 12 May 2016 23:17:37 +0000 (23:17 +0000)]
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
Baligh Uddin [Thu, 12 May 2016 23:15:18 +0000 (23:15 +0000)]
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
Baligh Uddin [Thu, 12 May 2016 23:12:59 +0000 (23:12 +0000)]
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
Baligh Uddin [Thu, 12 May 2016 23:10:35 +0000 (23:10 +0000)]
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
Baligh Uddin [Thu, 12 May 2016 23:08:02 +0000 (23:08 +0000)]
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
Baligh Uddin [Thu, 12 May 2016 23:05:19 +0000 (23:05 +0000)]
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
Baligh Uddin [Thu, 12 May 2016 22:55:26 +0000 (15:55 -0700)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Bug:
23967152
Change-Id: I2e2f1ead28f51f549dafacfc7d1d1e65b0b84bc7
The Android Automerger [Thu, 12 May 2016 22:27:57 +0000 (15:27 -0700)]
"NRD42C"
Ian Pedowitz [Thu, 12 May 2016 18:58:17 +0000 (18:58 +0000)]
Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev
Amanda Kassay [Thu, 12 May 2016 18:32:29 +0000 (18:32 +0000)]
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
Amanda Kassay [Thu, 12 May 2016 18:29:57 +0000 (18:29 +0000)]
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
Amanda Kassay [Thu, 12 May 2016 18:27:28 +0000 (18:27 +0000)]
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
Amanda Kassay [Thu, 12 May 2016 18:17:41 +0000 (14:17 -0400)]
Removing commented out deprecated download links in sdkpage.cs
Change-Id: Iad26e72120b110fa017821be887de0cd07b3889a
Ian Pedowitz [Thu, 12 May 2016 17:39:59 +0000 (10:39 -0700)]
PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
Bug:
27150977
Change-Id: I0958ee2cc377c5640c616dab8f093323ffd76c29
The Android Automerger [Thu, 12 May 2016 14:06:15 +0000 (07:06 -0700)]
"NRD42B"
The Android Automerger [Thu, 12 May 2016 07:06:15 +0000 (00:06 -0700)]
"NRD42"
The Android Automerger [Thu, 12 May 2016 07:02:34 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Joe Fernandez [Thu, 12 May 2016 06:34:58 +0000 (06:34 +0000)]
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
Joe Fernandez [Thu, 12 May 2016 06:32:49 +0000 (06:32 +0000)]
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
Joe Fernandez [Thu, 12 May 2016 02:43:25 +0000 (19:43 -0700)]
docs: Wear Preview - TOC and Resource card fixes for DoDS
b/
28004352
Change-Id: Iff222f71508c21e0b35a3d41c846c062755605cd
Baligh Uddin [Wed, 11 May 2016 23:42:40 +0000 (23:42 +0000)]
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
Baligh Uddin [Wed, 11 May 2016 23:39:21 +0000 (23:39 +0000)]
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
Baligh Uddin [Wed, 11 May 2016 23:30:50 +0000 (16:30 -0700)]
DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
This is needed for nemo* signing off emerald-dev.
Bug:
28726512
Alex Klyubin [Wed, 11 May 2016 19:11:11 +0000 (12:11 -0700)]
Fix handling of version codes in minSdkVersion when signing.
The APK signing tool, build/tools/signapk, needs to know the API Level
of the oldest platform supported by the APK. The APK's minSdkVersion
may reference that using a number (API Level) or a version code. To
handle the version code case, the existing logic was to see if it
matches $PLATFORM_VERSION_CODENAME and then substitute it with
$PLATFORM_SDK_VERSION.
However, some platforms support multiple version codes. To handle this
scenario, this commit changes the logic for computing the min API
Level for signing purposes to treat any non-numeric minSdkVersion as
$PLATFORM_SDK_VERSION.
Bug:
28715556
Change-Id: I292c96e8928b7e2f8d9716ef2be33a23a87764c4
smain@google.com [Wed, 11 May 2016 17:43:36 +0000 (17:43 +0000)]
Merge "remove silly css hack that\'s no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs am:
547111f16c am:
1db6c2f315
am:
9594b9991f
* commit '
9594b9991f78e9891b530eccdb5c72c0e7343c75':
remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems.
Change-Id: I91789079b83a42ab562bf1be84c6313c47185d3a
Scott Main [Wed, 11 May 2016 17:40:36 +0000 (17:40 +0000)]
Merge "remove silly css hack that\'s no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs am:
547111f16c
am:
1db6c2f315
* commit '
1db6c2f315c5bb4068325eb2f431a36c8d3c14ba':
remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems.
Change-Id: I050f42c42fd200ce4b6613945ffdc3a92f9fd0a9
Dirk Dougherty [Wed, 11 May 2016 17:37:46 +0000 (17:37 +0000)]
Custom data names for reference extensions. am:
ceb4a59409 am:
c72ec756c2
am:
a890553c51
* commit '
a890553c5137284a136f9391db78a0a2aa527c18':
Custom data names for reference extensions.
Change-Id: I5cb49898b977dbabba014aff5c45f5d902d719c1
smain@google.com [Wed, 11 May 2016 17:37:45 +0000 (17:37 +0000)]
Merge "remove silly css hack that\'s no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs
am:
547111f16c
* commit '
547111f16c6ee7418a20a9ef1f4e7d34e524d440':
remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems.
Change-Id: I4256cbf5f4cfe5187d7f5b58d7c0315c9d89ca27
Dirk Dougherty [Wed, 11 May 2016 17:34:56 +0000 (17:34 +0000)]
Custom data names for reference extensions. am:
ceb4a59409
am:
c72ec756c2
* commit '
c72ec756c27ccd0cde5e80a7242d3809398be19d':
Custom data names for reference extensions.
Change-Id: If1ac0af6c4f0a78295fec643e5c1352f2597271b
Scott Main [Wed, 11 May 2016 17:34:29 +0000 (17:34 +0000)]
Merge "remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs
Dirk Dougherty [Wed, 11 May 2016 17:32:16 +0000 (17:32 +0000)]
Custom data names for reference extensions.
am:
ceb4a59409
* commit '
ceb4a5940959248284af443971d831f8be5d1312':
Custom data names for reference extensions.
Change-Id: Ic3ffd1044067e3328709441234621c0e62677a13
smain@google.com [Wed, 11 May 2016 17:16:56 +0000 (10:16 -0700)]
remove silly css hack that's no longer needed in the new site design,
but which now actually causes layout problems.
Change-Id: I27859f6103ea0538442b22cd67b64d970d831d93
Nicholas Sauer [Wed, 11 May 2016 14:35:14 +0000 (14:35 +0000)]
Merge "Add org.apache.harmony.tests.javax.xml to old cts" into nyc-dev
The Android Automerger [Wed, 11 May 2016 07:05:13 +0000 (00:05 -0700)]
"NRD41"
The Android Automerger [Wed, 11 May 2016 07:02:30 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Dirk Dougherty [Wed, 11 May 2016 03:28:58 +0000 (20:28 -0700)]
Custom data names for reference extensions.
Change-Id: I55088a1ddb40fc3648dc8b983c94330084bb65f1
Dirk Dougherty [Wed, 11 May 2016 02:01:49 +0000 (02:01 +0000)]
For reference extension builds, update book_path to reference the appropriate file location. am:
8dbd7b96cf am:
ce46b86219
am:
1d2dbfe4f5
* commit '
1d2dbfe4f5d929d5c671a1d73ec38d8246b1b17a':
For reference extension builds, update book_path to reference the appropriate file location.
Change-Id: Id5ddec169d92b36f05a1d29b189b92f74396acb5
Dirk Dougherty [Wed, 11 May 2016 01:58:57 +0000 (01:58 +0000)]
For reference extension builds, update book_path to reference the appropriate file location. am:
8dbd7b96cf
am:
ce46b86219
* commit '
ce46b86219b973a5f90d16e5e59073952ef01519':
For reference extension builds, update book_path to reference the appropriate file location.
Change-Id: Icc7e68ec871661b3d2824452a4c12b24f9a83aee
Dirk Dougherty [Wed, 11 May 2016 01:56:11 +0000 (01:56 +0000)]
For reference extension builds, update book_path to reference the appropriate file location.
am:
8dbd7b96cf
* commit '
8dbd7b96cfd667866f992d8bf5252eb8bef29ccc':
For reference extension builds, update book_path to reference the appropriate file location.
Change-Id: I2555dee5e78998d8e042cfe22c45d9dadd469149
Dirk Dougherty [Wed, 11 May 2016 00:56:19 +0000 (17:56 -0700)]
For reference extension builds, update book_path to reference the appropriate file location.
Change-Id: I1eab8fcde8348e7cd7efa90c5c1768b1103e5b97
The Android Automerger [Tue, 10 May 2016 23:55:12 +0000 (16:55 -0700)]
"NRD40C"
Nicholas Sauer [Tue, 10 May 2016 19:54:32 +0000 (12:54 -0700)]
Add org.apache.harmony.tests.javax.xml to old cts
bug:
28556024
Change-Id: I7903ce93f27aef55f55acc9231e631d11a463f1b
The Android Automerger [Tue, 10 May 2016 13:26:26 +0000 (06:26 -0700)]
"NRD40B"
The Android Automerger [Tue, 10 May 2016 07:04:53 +0000 (00:04 -0700)]
"NRD40"
The Android Automerger [Tue, 10 May 2016 07:02:22 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 9 May 2016 23:44:54 +0000 (16:44 -0700)]
"NRD39B"
Andreas Gampe [Fri, 29 Apr 2016 21:34:10 +0000 (14:34 -0700)]
Build: Switch on oat file mini-debug-info for boot.oat
Enable mini-debug-info for the boot image by default. This
can be disabled with WITH_DEXPREOPT_DEBUG_INFO=false.
Bug:
28474219
(cherry picked from commit
58f6bfaa37946835b3a4da279e4e4743181da159)
Change-Id: Ifd59d854f01ad8cf703f16d7a6e88c2c82d47feb
The Android Automerger [Mon, 9 May 2016 07:03:17 +0000 (00:03 -0700)]
"NRD39"
The Android Automerger [Mon, 9 May 2016 07:02:14 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 8 May 2016 07:06:53 +0000 (00:06 -0700)]
"NRD38"
The Android Automerger [Sun, 8 May 2016 07:02:32 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Roozbeh Pournader [Fri, 6 May 2016 23:51:48 +0000 (23:51 +0000)]
Merge "Remove Romansh from PRODUCT_LOCALES" into nyc-dev
Roozbeh Pournader [Fri, 6 May 2016 22:10:51 +0000 (15:10 -0700)]
Remove Romansh from PRODUCT_LOCALES
The inclusion of Romansh (rm_CH), while it did not have localized
strings, was causing the incorrect assumption that the system
supports Romansh, causing the language fallback to work incorrectly
when Romansh was in the list of user's locales.
Hindi (hi_IN) was also included twice, and this removes the duplicate
too.
Bug:
27325465
Change-Id: I87ec06dc459137f71bb8e5e2f431f629bd51928e
Scott Main [Fri, 6 May 2016 16:37:05 +0000 (16:37 +0000)]
Revert "add studio survey button to header." 40k responses is probably enough. am:
4d6e15df03 am:
fa46661aa7 am:
3ff492deee
am:
20324e21f9
* commit '
20324e21f9752fcae8775f1a65dc24ffffe592e7':
Revert "add studio survey button to header." 40k responses is probably enough.
Change-Id: I22deb175299dd6614dc72c6daaa5baf2fab9342a
Scott Main [Fri, 6 May 2016 16:32:20 +0000 (16:32 +0000)]
Revert "add studio survey button to header." 40k responses is probably enough. am:
4d6e15df03 am:
fa46661aa7
am:
3ff492deee
* commit '
3ff492deee3df77f6a1ce8afa0fc8ac75d8808c2':
Revert "add studio survey button to header." 40k responses is probably enough.
Change-Id: Ib0bfd417c340f1f5d734f4551813cd6079b28f3e
Scott Main [Fri, 6 May 2016 16:27:28 +0000 (16:27 +0000)]
Revert "add studio survey button to header." 40k responses is probably enough. am:
4d6e15df03
am:
fa46661aa7
* commit '
fa46661aa7990698cc4e6e65b830a3ce94edcb07':
Revert "add studio survey button to header." 40k responses is probably enough.
Change-Id: I260ad3f4292699b37e8a9def1c259a95a5713c1c
Scott Main [Fri, 6 May 2016 16:22:24 +0000 (16:22 +0000)]
Revert "add studio survey button to header." 40k responses is probably enough.
am:
4d6e15df03
* commit '
4d6e15df032f561d64a11190df052aec364a3d47':
Revert "add studio survey button to header." 40k responses is probably enough.
Change-Id: I7fd13ab441835b3515e5a66aeda8e27ce748c8a8
Scott Main [Fri, 6 May 2016 16:08:56 +0000 (16:08 +0000)]
Revert "add studio survey button to header."
40k responses is probably enough.
This reverts commit
075aad742a9d12d43435e7b909a6a999c1050f6c.
Change-Id: I0c1964fda243c32f57156e762edec511314d9cb5
The Android Automerger [Fri, 6 May 2016 00:21:01 +0000 (17:21 -0700)]
"NRD35B"
Bjoern Johansson [Thu, 5 May 2016 15:38:32 +0000 (15:38 +0000)]
Merge "Indicate that all emulator images support USB" into nyc-dev
OSDN Git Service
