OSDN Git Service
Nicolas Geoffray [Thu, 14 Jul 2016 08:49:16 +0000 (08:49 +0000)]
Merge changes I7a052a8e,Idb11b1c0 into nyc-mr1-dev am:
7366e8c16a
am:
5a7be749f7
Change-Id: Idb189d89f9cebcc6e9809e7f489c51baae5e8253
Calin Juravle [Thu, 14 Jul 2016 08:39:22 +0000 (08:39 +0000)]
Merge changes I7a052a8e,Idb11b1c0 into nyc-mr1-dev
am:
7366e8c16a
Change-Id: I4f54b1b9c45294b2c3c43e0027ece1e8b38e335f
Nicolas Geoffray [Thu, 14 Jul 2016 08:32:51 +0000 (08:32 +0000)]
Merge changes I7a052a8e,Idb11b1c0 into nyc-mr1-dev
* changes:
[RFC] Special case system apps for profile optimizations
Compile core-apps according to their own "reason" for A/B
Calin Juravle [Tue, 12 Jul 2016 14:56:41 +0000 (15:56 +0100)]
[RFC] Special case system apps for profile optimizations
If the OTA updates a system app which was previously preopted to a non-
preopted state the app might end up being verified at runtime. That's
because by default the apps are verify-profile but for preopted apps
there's no profile.
Do a hacky check to ensure that if we have no profiles (a reasonable
indication that before the OTA the app was preopted) system apps get
compiled with a non-profile filter (by default interpret-only).
Bug:
30032273
Test: Andreas "has verified that Calin's change to A/B works as expected
and promotes things like SystemUI to speed. From my side, that's
ready to be merged"
Change-Id: I7a052a8ea76cab7f649dc993237ea05534d6c4b9
Justin Klaassen [Thu, 14 Jul 2016 05:20:11 +0000 (05:20 +0000)]
Merge \\"Make Night display off by default\\" into nyc-mr1-dev am:
acef1eb7c6
am:
2deb466d10
Change-Id: Ice19b1d5232e5a7a6bafda7b9cae8bf3f66de966
Justin Klaassen [Thu, 14 Jul 2016 05:15:00 +0000 (05:15 +0000)]
Merge \"Make Night display off by default\" into nyc-mr1-dev
am:
acef1eb7c6
Change-Id: Ic7de47c6ad8417ab91f2fcf981ba2f7a7828db98
Jack Yu [Thu, 14 Jul 2016 05:14:02 +0000 (05:14 +0000)]
Merge \\"Disable VT when users turn off data or hit data limit\\" into nyc-mr1-dev am:
92a07ae79d
am:
37506e246d
Change-Id: I8c3575407a785d7af9a3a9a73bd362275e55a75e
Jack Yu [Thu, 14 Jul 2016 05:07:47 +0000 (05:07 +0000)]
Merge \"Disable VT when users turn off data or hit data limit\" into nyc-mr1-dev
am:
92a07ae79d
Change-Id: Ia53f350beda8d9671cb67c2a01ed0071b65c4b76
TreeHugger Robot [Thu, 14 Jul 2016 05:04:38 +0000 (05:04 +0000)]
Merge "Make Night display off by default" into nyc-mr1-dev
Jack Yu [Thu, 14 Jul 2016 04:58:53 +0000 (04:58 +0000)]
Merge "Disable VT when users turn off data or hit data limit" into nyc-mr1-dev
Michael Kwan [Thu, 14 Jul 2016 03:45:47 +0000 (03:45 +0000)]
Merge \\"Update theme colours for watch type devices.\\" into nyc-mr1-dev am:
36bc5d5862
am:
4a5e1bd972
Change-Id: I2885555a62d5f3726dc6944ce9830e1ee68f0839
Michael Kwan [Thu, 14 Jul 2016 03:40:46 +0000 (03:40 +0000)]
Merge \"Update theme colours for watch type devices.\" into nyc-mr1-dev
am:
36bc5d5862
Change-Id: I885db69dcb088dd9df2418cae7b575ac00e90b3b
Michael Kwan [Thu, 14 Jul 2016 03:32:26 +0000 (03:32 +0000)]
Merge "Update theme colours for watch type devices." into nyc-mr1-dev
Erik Kline [Thu, 14 Jul 2016 03:27:53 +0000 (03:27 +0000)]
Merge \\"More correctly track upstream network properties.\\" into nyc-mr1-dev am:
5cbbc02a0f
am:
7c02a8872c
Change-Id: I1efaf412af81823025f06b2184b1fd0abe3a34b0
Tomasz Mikolajewski [Thu, 14 Jul 2016 03:27:49 +0000 (03:27 +0000)]
Merge \\"Fix javadoc broken links in DocumentsContract.\\" into nyc-mr1-dev am:
0e7bb571fd
am:
0f2a7ca01e
Change-Id: I219e199647533a22eecf9cb0cdf29057f37798e6
Erik Kline [Thu, 14 Jul 2016 03:21:57 +0000 (03:21 +0000)]
Merge \"More correctly track upstream network properties.\" into nyc-mr1-dev
am:
5cbbc02a0f
Change-Id: I8d6cbd8bb65b5c9f9701a76a34c3734db66edb27
Tomasz Mikolajewski [Thu, 14 Jul 2016 03:21:51 +0000 (03:21 +0000)]
Merge \"Fix javadoc broken links in DocumentsContract.\" into nyc-mr1-dev
am:
0e7bb571fd
Change-Id: I45a178f0897fd837307131007529286ca4af0025
TreeHugger Robot [Thu, 14 Jul 2016 03:17:04 +0000 (03:17 +0000)]
Merge "More correctly track upstream network properties." into nyc-mr1-dev
Tomasz Mikolajewski [Thu, 14 Jul 2016 03:16:40 +0000 (03:16 +0000)]
Merge "Fix javadoc broken links in DocumentsContract." into nyc-mr1-dev
TreeHugger Robot [Thu, 14 Jul 2016 03:09:53 +0000 (03:09 +0000)]
Merge "Allow root item accepts drag and drop."
Adam Lesinski [Thu, 14 Jul 2016 02:57:39 +0000 (02:57 +0000)]
Merge "AAPT: Improve debuggability of aapt dump badging errors"
Justin Klaassen [Wed, 13 Jul 2016 23:34:28 +0000 (16:34 -0700)]
Make Night display off by default
Bug:
30042357
Change-Id: Id7528ee56e162e3e2865a61273e8380ce299c0d7
Chris Craik [Thu, 14 Jul 2016 02:24:26 +0000 (02:24 +0000)]
Merge \\"Fix ShadowGrid in UiBench\\" into nyc-mr1-dev am:
0c05a3dd1c
am:
afc5673bdb
Change-Id: I831da22186f326cc9cccade1b5d5e006c252a802
Andrew Solovay [Thu, 14 Jul 2016 02:24:23 +0000 (02:24 +0000)]
Merge \\\"docs: Added link to API diff between M and N\\\" into nyc-dev am:
17b221792a am:
47912a55ac
am:
bc3efc589f
Change-Id: Id8baac1b8ec53aed980e98519c6c1c40d4addbf6
Andrew Solovay [Thu, 14 Jul 2016 02:24:21 +0000 (02:24 +0000)]
Merge \\\"docs: Added link to API diff between M and N\\\" into nyc-dev am:
17b221792a am:
73228f754d
am:
f5d4e6ea7d
Change-Id: Iacc74e1887727e0845726aa9871f74c0aa1b379c
Chris Craik [Thu, 14 Jul 2016 02:18:58 +0000 (02:18 +0000)]
Merge \"Fix ShadowGrid in UiBench\" into nyc-mr1-dev
am:
0c05a3dd1c
Change-Id: Ib0bdaa1f80e05f6409cbeb643e0708fac684b097
Andrew Solovay [Thu, 14 Jul 2016 02:18:51 +0000 (02:18 +0000)]
Merge \\"docs: Added link to API diff between M and N\\" into nyc-dev am:
17b221792a
am:
47912a55ac
Change-Id: I24d5a25c2fc81189a6a570381df6bff7246ade0a
Justin Klaassen [Thu, 14 Jul 2016 02:16:42 +0000 (02:16 +0000)]
Merge \\"Add Night display QSTile\\" into nyc-mr1-dev am:
558393740d
am:
29977c9a7b
Change-Id: I0ba476fc589d86473499e5b2669ad14dd9ff2fc6
Andrew Solovay [Thu, 14 Jul 2016 02:12:04 +0000 (02:12 +0000)]
Merge \\"docs: Added link to API diff between M and N\\" into nyc-dev am:
17b221792a
am:
73228f754d
Change-Id: Ib6b3d7ab22795944df5661334e8c742d6c8fe0bf
TreeHugger Robot [Thu, 14 Jul 2016 02:09:04 +0000 (02:09 +0000)]
Merge "Fix ShadowGrid in UiBench" into nyc-mr1-dev
Adam Lesinski [Thu, 14 Jul 2016 02:06:39 +0000 (02:06 +0000)]
Merge \"Merge \\\"Don\\\'t hold on to AssetManager instances\\\" into nyc-dev am:
f8e99e72e7 am:
ce9cf64eb3\" into nyc-mr1-dev-plus-aosp
am:
26a9bdae3e
Change-Id: Ia21e20df03b2f1704afa2716a526b933ab08fd5a
Selim Cinek [Thu, 14 Jul 2016 02:06:34 +0000 (02:06 +0000)]
Merge \"Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev am:
a7ebd4f4bb\" into nyc-mr1-dev-plus-aosp
am:
36c6cf1bdc
Change-Id: I5ecebb835b60f163ad1d6cdff41b30c5590eb8cc
Justin Klaassen [Thu, 14 Jul 2016 02:06:29 +0000 (02:06 +0000)]
Merge \"Add Night display QSTile\" into nyc-mr1-dev
am:
558393740d
Change-Id: I96c1a26498ae84bfc5128e2ff9fc7bf376d51d89
Adam Lesinski [Thu, 14 Jul 2016 02:06:28 +0000 (02:06 +0000)]
Merge \\\"Don\\\'t hold on to AssetManager instances\\\" into nyc-dev am:
f8e99e72e7 am:
165e9d92b2
am:
3d53abec7d
Change-Id: Ife9502a444f46d6327e08248833814bd2357d7a2
Andrew Solovay [Thu, 14 Jul 2016 02:05:50 +0000 (02:05 +0000)]
Merge \"docs: Added link to API diff between M and N\" into nyc-dev
am:
17b221792a
Change-Id: I96dbdbdf051b891c91421eb0bfe2080a06a006cd
Andrew Solovay [Thu, 14 Jul 2016 02:03:59 +0000 (02:03 +0000)]
Merge \"docs: Added link to API diff between M and N\" into nyc-dev
am:
17b221792a
Change-Id: I435a52f4bbf224a1f64ca2c34ea17c1e6ac779d0
Android Build Merger (Role) [Thu, 14 Jul 2016 01:59:36 +0000 (01:59 +0000)]
Merge "Merge \\"Don\\'t hold on to AssetManager instances\\" into nyc-dev am:
f8e99e72e7 am:
ce9cf64eb3" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 14 Jul 2016 01:59:24 +0000 (01:59 +0000)]
Merge "Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev am:
a7ebd4f4bb" into nyc-mr1-dev-plus-aosp
Adam Lesinski [Thu, 14 Jul 2016 01:58:58 +0000 (01:58 +0000)]
Merge \\"Don\\'t hold on to AssetManager instances\\" into nyc-dev am:
f8e99e72e7
am:
ce9cf64eb3
Change-Id: Ie197ed068d094a6cc7a67b751ffde488d88f604b
Selim Cinek [Thu, 14 Jul 2016 01:58:52 +0000 (01:58 +0000)]
Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev
am:
a7ebd4f4bb
Change-Id: Id3ffe5addb5e036eeda993d8dd6603b88c785804
Adam Lesinski [Thu, 14 Jul 2016 01:57:52 +0000 (01:57 +0000)]
Merge \\"Don\\'t hold on to AssetManager instances\\" into nyc-dev am:
f8e99e72e7
am:
165e9d92b2
Change-Id: I184f3508fd602409d01f105500693b5d02ab37a3
TreeHugger Robot [Thu, 14 Jul 2016 01:57:09 +0000 (01:57 +0000)]
Merge "Add Night display QSTile" into nyc-mr1-dev
Andrew Solovay [Thu, 14 Jul 2016 01:52:18 +0000 (01:52 +0000)]
Merge "docs: Added link to API diff between M and N" into nyc-dev
Adam Lesinski [Thu, 14 Jul 2016 01:50:52 +0000 (01:50 +0000)]
Merge \"Don\'t hold on to AssetManager instances\" into nyc-dev
am:
f8e99e72e7
Change-Id: Id29ae90fd336657d428a15fa0730b95d717386db
Adam Lesinski [Thu, 14 Jul 2016 01:50:52 +0000 (01:50 +0000)]
Merge \"Don\'t hold on to AssetManager instances\" into nyc-dev
am:
f8e99e72e7
Change-Id: I71b7499c6399ecbf1d8e8d93bf410aabbb2a1044
Adam Lesinski [Thu, 14 Jul 2016 01:40:34 +0000 (01:40 +0000)]
Merge "Don't hold on to AssetManager instances" into nyc-dev
Garfield, Tan [Wed, 13 Jul 2016 16:23:04 +0000 (09:23 -0700)]
Allow root item accepts drag and drop.
Bug:
28315281
Change-Id: Ie37536258f04c1b0d3ff5a315f4a5fa33e0ba182
TreeHugger Robot [Thu, 14 Jul 2016 01:38:52 +0000 (01:38 +0000)]
Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev
* changes:
Fixed a bug where the headsup would be stuck disappearing
Changed the appearance of phone call notifications
Phil Weaver [Thu, 14 Jul 2016 01:36:23 +0000 (01:36 +0000)]
Merge \\"Behave if the same view gets a11y focus twice.\\" into nyc-mr1-dev am:
93d51af336
am:
35dc926772
Change-Id: Iaa366dc78b4a07a7a998e9d8b432a948762a92ff
Jeff Sharkey [Thu, 14 Jul 2016 01:36:21 +0000 (01:36 +0000)]
Merge \\"Preemptively add string for possible toast.\\" into nyc-mr1-dev am:
ec2ea47ead
am:
53a160fa30
Change-Id: I68bd4aac7f1766152fbb976233340737e6e02ee4
Phil Weaver [Thu, 14 Jul 2016 01:31:25 +0000 (01:31 +0000)]
Merge \"Behave if the same view gets a11y focus twice.\" into nyc-mr1-dev
am:
93d51af336
Change-Id: I7ea7779f5f8735d6c10743eb3e7199b5a1d6c85d
Jeff Sharkey [Thu, 14 Jul 2016 01:31:20 +0000 (01:31 +0000)]
Merge \"Preemptively add string for possible toast.\" into nyc-mr1-dev
am:
ec2ea47ead
Change-Id: I1f2578e51ae244de2a68ea72bf0bd0dd8f7e4b11
Wei Jia [Thu, 14 Jul 2016 01:30:55 +0000 (01:30 +0000)]
Merge \"Merge \\\"MediaDataSource: add DrmInitialization for IDataSource.\\\" into nyc-dev am:
9604b3803c am:
27a1e97ae4\" into nyc-mr1-dev-plus-aosp
am:
ed9e4272ae
Change-Id: Ic61addb058963765d23711eb20dba1e556965897
Wei Jia [Thu, 14 Jul 2016 01:29:37 +0000 (01:29 +0000)]
Merge \\\"MediaDataSource: add DrmInitialization for IDataSource.\\\" into nyc-dev am:
9604b3803c am:
44d76c7a72
am:
b249bd886e
Change-Id: Ie96308895c2dd56f309a8c98847f38d19d903977
Phil Weaver [Thu, 14 Jul 2016 01:25:04 +0000 (01:25 +0000)]
Merge "Behave if the same view gets a11y focus twice." into nyc-mr1-dev
Android Build Merger (Role) [Thu, 14 Jul 2016 01:23:25 +0000 (01:23 +0000)]
Merge "Merge \\"MediaDataSource: add DrmInitialization for IDataSource.\\" into nyc-dev am:
9604b3803c am:
27a1e97ae4" into nyc-mr1-dev-plus-aosp
Wei Jia [Thu, 14 Jul 2016 01:22:43 +0000 (01:22 +0000)]
Merge \\"MediaDataSource: add DrmInitialization for IDataSource.\\" into nyc-dev am:
9604b3803c
am:
27a1e97ae4
Change-Id: I4ef412061dc509c0deee145cdeb09afeb3032df2
Wei Jia [Thu, 14 Jul 2016 01:22:26 +0000 (01:22 +0000)]
Merge \\"MediaDataSource: add DrmInitialization for IDataSource.\\" into nyc-dev am:
9604b3803c
am:
44d76c7a72
Change-Id: I633e9505a0a7a733ebc7432b23987b513a6fd655
TreeHugger Robot [Thu, 14 Jul 2016 01:16:37 +0000 (01:16 +0000)]
Merge "Preemptively add string for possible toast." into nyc-mr1-dev
Wei Jia [Thu, 14 Jul 2016 01:14:42 +0000 (01:14 +0000)]
Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-dev
am:
9604b3803c
Change-Id: Ibbb2272be91fb6c79795566cb9928bfb8adde002
Wei Jia [Thu, 14 Jul 2016 01:14:40 +0000 (01:14 +0000)]
Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-dev
am:
9604b3803c
Change-Id: I080b409a7f73cfadd5103efbbe563184d57f63d7
TreeHugger Robot [Thu, 14 Jul 2016 01:07:13 +0000 (01:07 +0000)]
Merge "MediaDataSource: add DrmInitialization for IDataSource." into nyc-dev
Adam Lesinski [Wed, 13 Jul 2016 17:14:03 +0000 (10:14 -0700)]
AAPT: Improve debuggability of aapt dump badging errors
AAPT dump badging errors have been cryptic and difficult
to debug for app developers. Added some line info to the
error statements.
Change-Id: Ieeeb903a1274a91b77329b445e0248b1e67c9568
Michael Kwan [Thu, 14 Jul 2016 00:41:29 +0000 (17:41 -0700)]
Update theme colours for watch type devices.
Bug:
26914376
Change-Id: I127a9404fa8dea2db6c3196742566f8d12ccb113
Android Build Merger (Role) [Thu, 14 Jul 2016 00:37:05 +0000 (00:37 +0000)]
Merge "[NAN] Provide inteface MAC address to app. am:
d097f8a4e5"
Etan Cohen [Thu, 14 Jul 2016 00:36:30 +0000 (00:36 +0000)]
[NAN] Provide inteface MAC address to app.
am:
d097f8a4e5
Change-Id: I62b0b2cfd4a95c23b89c938cef1118ab81c304ce
Daniel Nishi [Thu, 14 Jul 2016 00:36:20 +0000 (00:36 +0000)]
Merge \\"Give the default storage manager access to the storage permissions.\\" into nyc-mr1-dev am:
0e5ac11d30
am:
dc327ee129
Change-Id: I764e9138b6517452719a91018f50cccb614e24ac
TreeHugger Robot [Thu, 14 Jul 2016 00:31:02 +0000 (00:31 +0000)]
Merge "Follow up changes from ag/
1190582."
Tim Murray [Thu, 14 Jul 2016 00:27:07 +0000 (00:27 +0000)]
Merge \"Merge \\\"Don\\\'t dump stack traces for background ANRs.\\\" into nyc-dev am:
b2b203ae13 am:
d14f678120\" into nyc-mr1-dev-plus-aosp
am:
b95b0641b5
Change-Id: Ib066814d0430d64c0b396ddeab98dd84554c8e7c
Tim Murray [Thu, 14 Jul 2016 00:27:03 +0000 (00:27 +0000)]
Merge \\\"Don\\\'t dump stack traces for background ANRs.\\\" into nyc-dev am:
b2b203ae13 am:
a7a3427425
am:
40d4e97da7
Change-Id: I570941b6e1bca80d8e3f6d8e3596ad2e04ab7fc3
Adam Lesinski [Wed, 13 Jul 2016 19:09:24 +0000 (12:09 -0700)]
Don't hold on to AssetManager instances
If we enter multi-window mode or load WebView
assets into a Resources object, then the underlying
AssetManager instance may change.
crbug.com/627586
Bug:
30118654
Change-Id: I837637bdad5370809db7f060d7d8536b536cad9e
Daniel Nishi [Thu, 14 Jul 2016 00:20:25 +0000 (00:20 +0000)]
Merge \"Give the default storage manager access to the storage permissions.\" into nyc-mr1-dev
am:
0e5ac11d30
Change-Id: I15b7c3b9b2a2c4d4f62480effafd063d79a92dd2
Evan Rosky [Thu, 14 Jul 2016 00:19:07 +0000 (00:19 +0000)]
Merge "Add a flag that prevents resuming previous user after guest logout"
Android Build Merger (Role) [Thu, 14 Jul 2016 00:15:42 +0000 (00:15 +0000)]
Merge "Merge \\"Don\\'t dump stack traces for background ANRs.\\" into nyc-dev am:
b2b203ae13 am:
d14f678120" into nyc-mr1-dev-plus-aosp
Andrew Sapperstein [Thu, 14 Jul 2016 00:15:39 +0000 (00:15 +0000)]
Merge \\"Use colorControlHighlight for print button ripple.\\" into nyc-mr1-dev am:
4e5008c4c5
am:
69bee9bbcc
Change-Id: Ief89eaba89b1aea04b96a5e3b864c385f74388f3
Wei Liu [Thu, 14 Jul 2016 00:15:25 +0000 (00:15 +0000)]
Merge \\"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\\" into nyc-mr1-dev am:
6e8630307a
am:
05c2c22a80
Change-Id: I8af1193d4af465f234c8ba08ff0eeefa7279e029
Tim Murray [Thu, 14 Jul 2016 00:15:19 +0000 (00:15 +0000)]
Merge \\"Don\\'t dump stack traces for background ANRs.\\" into nyc-dev am:
b2b203ae13
am:
d14f678120
Change-Id: Iccd496d03aa1b3ea545d75e87576e9de90825f90
Fyodor Kupolov [Thu, 14 Jul 2016 00:15:15 +0000 (00:15 +0000)]
Merge \\"Disallow safe boot when in demo mode\\" into nyc-mr1-dev am:
f61eb922f9
am:
71d286a45d
Change-Id: I75374581e5bf4f14eccb581b0895ea204223fa1a
Annie Chin [Thu, 14 Jul 2016 00:15:10 +0000 (00:15 +0000)]
Merge \\"Set mContext scope to protected.\\" into nyc-mr1-dev am:
8709d0fce8
am:
e4747b39f0
Change-Id: If9d00d81152583305c6d526bf5c9e72281edc19c
Tim Murray [Thu, 14 Jul 2016 00:14:54 +0000 (00:14 +0000)]
Merge \\"Don\\'t dump stack traces for background ANRs.\\" into nyc-dev am:
b2b203ae13
am:
a7a3427425
Change-Id: Iba6c0ba7dfbdddb51b0259524def8a5ebc26ff31
TreeHugger Robot [Thu, 14 Jul 2016 00:13:46 +0000 (00:13 +0000)]
Merge "Give the default storage manager access to the storage permissions." into nyc-mr1-dev
Andrew Sapperstein [Thu, 14 Jul 2016 00:08:21 +0000 (00:08 +0000)]
Merge \"Use colorControlHighlight for print button ripple.\" into nyc-mr1-dev
am:
4e5008c4c5
Change-Id: Ide94360486909773a55734140efd3d29adfdd239
Wei Liu [Thu, 14 Jul 2016 00:08:07 +0000 (00:08 +0000)]
Merge \"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\" into nyc-mr1-dev
am:
6e8630307a
Change-Id: I7e381d5d62f9c79b0c604518ff6ea2d1d9c38dc4
Tim Murray [Thu, 14 Jul 2016 00:07:51 +0000 (00:07 +0000)]
Merge \"Don\'t dump stack traces for background ANRs.\" into nyc-dev
am:
b2b203ae13
Change-Id: I0777b4d28be2601425b6fe7f51f3ec7dc5635c6e
Tim Murray [Thu, 14 Jul 2016 00:07:49 +0000 (00:07 +0000)]
Merge \"Don\'t dump stack traces for background ANRs.\" into nyc-dev
am:
b2b203ae13
Change-Id: Iea2c941636c829b687470244cff22a03ea51d9f7
Tim Murray [Thu, 14 Jul 2016 00:00:29 +0000 (00:00 +0000)]
Merge "Don't dump stack traces for background ANRs." into nyc-dev
Andrew Sapperstein [Thu, 14 Jul 2016 00:00:25 +0000 (00:00 +0000)]
Merge "Use colorControlHighlight for print button ripple." into nyc-mr1-dev
Wei Liu [Wed, 13 Jul 2016 23:59:27 +0000 (23:59 +0000)]
Merge "Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting." into nyc-mr1-dev
Doris Liu [Wed, 13 Jul 2016 23:58:31 +0000 (23:58 +0000)]
Merge \\"Fix use-after-free in vector drawable animation\\" into nyc-mr1-dev am:
133ab10464
am:
7628ae28d5
Change-Id: I908b552335f10a8570a367d017741c0b76622948
Annie Chin [Wed, 13 Jul 2016 23:58:24 +0000 (23:58 +0000)]
Merge \\"Add setLandscape() method to ButtonInterface\\" into nyc-mr1-dev am:
3372c90cd7
am:
6de0295b30
Change-Id: I0621d0ddadb0f054e096c3dc2a941276be90e3b7
Fyodor Kupolov [Wed, 13 Jul 2016 23:53:47 +0000 (23:53 +0000)]
Merge \"Disallow safe boot when in demo mode\" into nyc-mr1-dev
am:
f61eb922f9
Change-Id: I2a8afd796453633cab0fbb0803c4c34a61ac3657
Annie Chin [Wed, 13 Jul 2016 23:53:42 +0000 (23:53 +0000)]
Merge \"Set mContext scope to protected.\" into nyc-mr1-dev
am:
8709d0fce8
Change-Id: I23720c8a6f577da910a45bbbc4373f1ad9256ce8
David Friedman [Wed, 13 Jul 2016 23:49:17 +0000 (23:49 +0000)]
Merge \"Merge \\"Merge \\\"Doc: Minor fixes following launch of Performance section on DAC.\\\" into nyc-dev am:
419dbdb538\\" into nyc-mr1-dev am:
30c4050703\" into nyc-mr1-dev-plus-aosp
am:
81d835b902
Change-Id: Iaccee7f89656032d351f7024f585b5c663575900
Chris Craik [Wed, 13 Jul 2016 23:49:14 +0000 (23:49 +0000)]
Merge \"Merge \\"Merge \\\"Avoid throwing when 0 size layer requested\\\" into nyc-dev am:
807989facd\\" into nyc-mr1-dev am:
eaeee37417\" into nyc-mr1-dev-plus-aosp
am:
04fd0ab1c4
Change-Id: If57d409bb6cdd86fd8ba613857e0e34034abc2ee
Ashutosh Joshi [Wed, 13 Jul 2016 23:46:22 +0000 (23:46 +0000)]
Merge \"Merge \\"Add state for loading/unloading apps\\" into nyc-mr1-dev am:
2e42020eab\" into nyc-mr1-dev-plus-aosp
am:
5c99851d23
Change-Id: I0f52f1406840b9ddcfe9dd30c19c5ea01755039f
Winson [Wed, 13 Jul 2016 23:46:18 +0000 (23:46 +0000)]
Merge \"Merge \\"Ensure we pass correct values into the next transition start bounds.\\" into nyc-mr1-dev am:
7a07477cff\" into nyc-mr1-dev-plus-aosp
am:
51649da59b
Change-Id: I36a82119ee7e7aace1e42d44a208432a91b68610
Todd Kennedy [Wed, 13 Jul 2016 23:46:15 +0000 (23:46 +0000)]
Merge \"Merge \\"Remove subtle dependencies\\" into nyc-mr1-dev am:
c8daad4290\" into nyc-mr1-dev-plus-aosp
am:
d49214900b
Change-Id: Ic6c7a96df4013ddd6b3844ba8cb9fc99ff7a483c
David Friedman [Wed, 13 Jul 2016 23:46:11 +0000 (23:46 +0000)]
Merge \\\"Doc: Minor fixes following launch of Performance section on DAC.\\\" into nyc-dev am:
419dbdb538 am:
2d03a0c9c4
am:
cc3108d937
Change-Id: Iad773758f0d4da12a9f6a0363055ef245459d8ca
Chris Craik [Wed, 13 Jul 2016 23:46:07 +0000 (23:46 +0000)]
Merge \\\"Avoid throwing when 0 size layer requested\\\" into nyc-dev am:
807989facd am:
9014be18b3
am:
f7b3896358
Change-Id: I2569f151a34fd5ca62a1b70c041b17603920ed27
Doris Liu [Wed, 13 Jul 2016 23:45:53 +0000 (23:45 +0000)]
Merge \"Fix use-after-free in vector drawable animation\" into nyc-mr1-dev
am:
133ab10464
Change-Id: Ice990efd5e8a2554c8a57b191e4d288971270919
OSDN Git Service
