OSDN Git Service
Android Build Merger (Role) [Thu, 14 Jul 2016 22:19:15 +0000 (22:19 +0000)]
Merge "Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\" into nyc-dev am:
488042fe3b am:
c4ef7669a1" into nyc-mr1-dev-plus-aosp
Victor Chang [Thu, 14 Jul 2016 22:18:51 +0000 (22:18 +0000)]
Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\" into nyc-dev am:
488042fe3b
am:
c4ef7669a1
Change-Id: I475fad882d4fb67e3af813b3a2a2548dae760c16
Victor Chang [Thu, 14 Jul 2016 22:18:28 +0000 (22:18 +0000)]
Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\" into nyc-dev am:
488042fe3b
am:
07e11c3ae9
Change-Id: If1ff799f4c515b84dbb8cb4fa6f06f747f78bf67
Victor Chang [Thu, 14 Jul 2016 22:10:06 +0000 (22:10 +0000)]
Merge \"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\" into nyc-dev
am:
488042fe3b
Change-Id: Ia41b8b2acbe3897423ac27881f3419efcfeeb002
Victor Chang [Thu, 14 Jul 2016 22:09:59 +0000 (22:09 +0000)]
Merge \"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\" into nyc-dev
am:
488042fe3b
Change-Id: I4d542c19e057b044544a2ed4f07b9c2cc5866f0f
Victor Chang [Thu, 14 Jul 2016 22:04:10 +0000 (22:04 +0000)]
Merge "Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set" into nyc-dev
Android Build Merger (Role) [Thu, 14 Jul 2016 20:51:57 +0000 (20:51 +0000)]
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
9cdfb9d781 -s ours am:
60c459ff05 -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Thu, 14 Jul 2016 20:51:21 +0000 (20:51 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
9cdfb9d781 -s ours
am:
87df5f6ded -s ours
Change-Id: I76787013cb8774e862b7501852604d2c666f68c9
Bill Yi [Thu, 14 Jul 2016 20:51:20 +0000 (20:51 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
9cdfb9d781 -s ours
am:
60c459ff05 -s ours
Change-Id: I41ae231a6db88832a05674e20c8aa5e0fcac2c56
Bill Yi [Thu, 14 Jul 2016 20:47:18 +0000 (20:47 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
9cdfb9d781 -s ours
Change-Id: I861d47e86d5695382ecf2e3093e567f710273c1c
Bill Yi [Thu, 14 Jul 2016 20:46:02 +0000 (20:46 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
9cdfb9d781 -s ours
Change-Id: Ib5e9579d28d84fa2fa26910fb6857b06b2d09560
TreeHugger Robot [Thu, 14 Jul 2016 20:39:48 +0000 (20:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Thu, 14 Jul 2016 20:31:54 +0000 (20:31 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
a035048d35 -s ours
Change-Id: I233dad03d066fea8fd951247360e687f4c2ae84c
TreeHugger Robot [Thu, 14 Jul 2016 20:27:16 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Jason Monk [Thu, 14 Jul 2016 20:22:43 +0000 (20:22 +0000)]
Merge \"Add LTE+ and update 4G+ icons\" into nyc-mr1-dev
am:
5768a5dd30
Change-Id: I475dbf0263569f1112c6b43613ef9a26e4bfcd0f
Jeff Sharkey [Thu, 14 Jul 2016 20:14:31 +0000 (20:14 +0000)]
Merge \"Require permission for FLAG_WILL_BE_FOREGROUND.\" into nyc-mr1-dev
am:
97639a1310
Change-Id: I90756b855879cf37bc0bca86844fe99f8a62ef25
TreeHugger Robot [Thu, 14 Jul 2016 20:08:58 +0000 (20:08 +0000)]
Merge "Add LTE+ and update 4G+ icons" into nyc-mr1-dev
Wale Ogunwale [Thu, 14 Jul 2016 20:06:43 +0000 (20:06 +0000)]
Merge \"Allow no longer waiting for visible activity to be stopped.\" into nyc-mr1-dev
am:
5ac1b52aaa
Change-Id: I10b9fc8a66041f32dcfae62cf70ca0315a0185f7
TreeHugger Robot [Thu, 14 Jul 2016 20:05:37 +0000 (20:05 +0000)]
Merge "Require permission for FLAG_WILL_BE_FOREGROUND." into nyc-mr1-dev
TreeHugger Robot [Thu, 14 Jul 2016 19:55:12 +0000 (19:55 +0000)]
Merge "Allow no longer waiting for visible activity to be stopped." into nyc-mr1-dev
Carlos Valdivia [Thu, 14 Jul 2016 19:33:41 +0000 (19:33 +0000)]
Merge \"Only broadcast LOGIN_ACCOUNTS_CHANGED when changes occur.\" into nyc-mr1-dev
am:
327c7e4c06
Change-Id: Id321433f4417eaaffb03d123bd2ed16e94255e93
Justin Klaassen [Thu, 14 Jul 2016 19:33:35 +0000 (19:33 +0000)]
Merge \"Refactor display color transforms\" into nyc-mr1-dev
am:
94673f0b7c
Change-Id: I7fdf83db6cbf26cdc5b8a9971fa48b7f8458474d
Android Build Merger (Role) [Thu, 14 Jul 2016 19:23:55 +0000 (19:23 +0000)]
Merge "Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b am:
bab3334226 am:
ff58d7c918 -s ours am:
437776ac65 am:
7c19aa73f7" into nyc-mr1-dev-plus-aosp
Sergio Giro [Thu, 14 Jul 2016 19:23:33 +0000 (19:23 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b am:
bab3334226 am:
ff58d7c918 -s ours am:
437776ac65
am:
7c19aa73f7
Change-Id: Icf8516eb92a8ad38579cdf3483e6892f37ad6b95
Sergio Giro [Thu, 14 Jul 2016 19:23:21 +0000 (19:23 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b am:
bab3334226 am:
ff58d7c918 -s ours am:
437776ac65
am:
73b29dc307
Change-Id: I4f294d6a5a85d4c1fd14e392020b14bc57c90e95
Carlos Valdivia [Thu, 14 Jul 2016 19:11:02 +0000 (19:11 +0000)]
Merge "Only broadcast LOGIN_ACCOUNTS_CHANGED when changes occur." into nyc-mr1-dev
Justin Klaassen [Thu, 14 Jul 2016 18:55:30 +0000 (18:55 +0000)]
Merge "Refactor display color transforms" into nyc-mr1-dev
Sergio Giro [Thu, 14 Jul 2016 18:48:57 +0000 (18:48 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b am:
bab3334226 am:
ff58d7c918 -s ours
am:
437776ac65
Change-Id: I5cfc049e64fd76fc865dcaf04590e3f665dc91f4
Sergio Giro [Thu, 14 Jul 2016 18:48:55 +0000 (18:48 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b am:
bab3334226 am:
ff58d7c918 -s ours
am:
437776ac65
Change-Id: Ic88ad611257693f8f5691e48493ed0ac46a1a45a
Sergio Giro [Thu, 14 Jul 2016 18:42:45 +0000 (18:42 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b am:
bab3334226
am:
ff58d7c918 -s ours
Change-Id: I31000817d4f99c215277d580948a20194176d53e
Felipe Leme [Thu, 14 Jul 2016 18:35:45 +0000 (18:35 +0000)]
Merge \\"Fixed statuses on Battery Saver column.\\" into nyc-dev am:
24b2e7bbee
am:
bc84c54a2b
Change-Id: I6fdb61d652acba14c8e66bdfce0019701d8bb465
Android Build Merger (Role) [Thu, 14 Jul 2016 18:31:17 +0000 (18:31 +0000)]
Merge "Merge \\"Fixed statuses on Battery Saver column.\\" into nyc-dev am:
24b2e7bbee am:
28318faf16" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 14 Jul 2016 18:31:04 +0000 (18:31 +0000)]
Merge "delete old Community page, redirect to Support page am:
845cf07bdd am:
c5084eac0f" into nyc-mr1-dev-plus-aosp
Felipe Leme [Thu, 14 Jul 2016 18:30:34 +0000 (18:30 +0000)]
Merge \\"Fixed statuses on Battery Saver column.\\" into nyc-dev am:
24b2e7bbee
am:
28318faf16
Change-Id: Id23c8c2af5ce170f00cf1d3968c56a59d5f168fb
smain@google.com [Thu, 14 Jul 2016 18:30:30 +0000 (18:30 +0000)]
delete old Community page, redirect to Support page am:
845cf07bdd
am:
c5084eac0f
Change-Id: I4bbd7f4599ffff1e48ecbf7a5a7fd2007ccfdfc7
smain@google.com [Thu, 14 Jul 2016 18:29:54 +0000 (18:29 +0000)]
delete old Community page, redirect to Support page am:
845cf07bdd
am:
49d6fd640b
Change-Id: I66a8914d16690c9df4987f8d098e43e7bf234f10
Justin Klaassen [Tue, 12 Jul 2016 03:52:23 +0000 (20:52 -0700)]
Refactor display color transforms
- Removed Secure.ACCESSIBILITY_DISPLAY_COLOR_MATRIX, it's not desirable
to persist the actual color transformation matrix.
- Refactored all SurfaceFlinger transforms to DisplayTransformManager,
which allows color transforms to be set independently from the a11y
manager service.
Bug:
30042357
Change-Id: Iefa477dedb66aac90e1218e327802a3fab6899ed
Sergio Giro [Thu, 14 Jul 2016 18:23:54 +0000 (18:23 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b
am:
bab3334226
Change-Id: I6e4e399dfcf89f46d40a162c77462b889883f569
Felipe Leme [Thu, 14 Jul 2016 18:23:34 +0000 (18:23 +0000)]
Merge \"Fixed statuses on Battery Saver column.\" into nyc-dev
am:
24b2e7bbee
Change-Id: I7920617a1506817b25ade8e92bfb1945d2f173bb
Felipe Leme [Thu, 14 Jul 2016 18:23:12 +0000 (18:23 +0000)]
Merge \"Fixed statuses on Battery Saver column.\" into nyc-dev
am:
24b2e7bbee
Change-Id: I6b871cebf05f0fe18b054df456aabd80b10336aa
smain@google.com [Thu, 14 Jul 2016 18:23:04 +0000 (18:23 +0000)]
delete old Community page, redirect to Support page
am:
845cf07bdd
Change-Id: Icf5f64df8ec68544b6e4888309444ef39cb8b494
Android Build Merger (Role) [Thu, 14 Jul 2016 18:16:48 +0000 (18:16 +0000)]
Merge "Add bound checks to utf16_to_utf8 am:
1deedbacc3 am:
ea79ab4e82" into nyc-mr1-dev-plus-aosp
Sergio Giro [Thu, 14 Jul 2016 18:15:48 +0000 (18:15 +0000)]
Add bound checks to utf16_to_utf8 am:
1deedbacc3
am:
ea79ab4e82
Change-Id: Ic7880fbadc52f5d36deca38812fa092608d43c2a
Sergio Giro [Thu, 14 Jul 2016 18:15:36 +0000 (18:15 +0000)]
Add bound checks to utf16_to_utf8 am:
1deedbacc3
am:
6feeeabd20
Change-Id: Idd7b5480cefc915dcd68aaa200571fa0d13b8007
Sergio Giro [Thu, 14 Jul 2016 18:15:33 +0000 (18:15 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2
am:
008120497b
Change-Id: Ib3135f8f186b10b773592d2bcbeae398cfd2fee1
smain@google.com [Thu, 14 Jul 2016 18:14:02 +0000 (18:14 +0000)]
delete old Community page, redirect to Support page
am:
845cf07bdd
Change-Id: I9df159290cf9818dd566754cea0e880afdb1633d
Felipe Leme [Thu, 14 Jul 2016 18:10:55 +0000 (18:10 +0000)]
Merge "Fixed statuses on Battery Saver column." into nyc-dev
Sergio Giro [Thu, 14 Jul 2016 18:07:34 +0000 (18:07 +0000)]
Add bound checks to utf16_to_utf8
am:
1deedbacc3
Change-Id: I5004728668382feeafcc6fa6155b3169d8240664
Sergio Giro [Thu, 14 Jul 2016 18:07:33 +0000 (18:07 +0000)]
Add bound checks to utf16_to_utf8
am:
1deedbacc3
Change-Id: I05847ae2c26a266b3c05324230062757e6978fd2
Sergio Giro [Thu, 14 Jul 2016 18:07:23 +0000 (18:07 +0000)]
Add bound checks to utf16_to_utf8
am:
bce11021b2
Change-Id: Ic4995dee3763290f75b3ef623f257c71748d9d51
smain@google.com [Thu, 14 Jul 2016 18:05:19 +0000 (11:05 -0700)]
delete old Community page, redirect to Support page
Change-Id: I2c570f8bf88392db75aa78c2e702515b262f2830
Felipe Leme [Thu, 14 Jul 2016 18:04:49 +0000 (11:04 -0700)]
Fixed statuses on Battery Saver column.
BUG:
30139400
Change-Id: I1798607af13c9be5e1f21212fd7078f7152562bd
Makoto Onuki [Thu, 14 Jul 2016 18:03:00 +0000 (18:03 +0000)]
Merge \"Don\'t allow shortcuts with non-main activities\" into nyc-mr1-dev
am:
e5b46f3bd5
Change-Id: I1b2e721e0bb44c35c49d8d983bc6b5a3e7a73d3d
Makoto Onuki [Thu, 14 Jul 2016 17:50:21 +0000 (17:50 +0000)]
Merge "Don't allow shortcuts with non-main activities" into nyc-mr1-dev
Makoto Onuki [Thu, 14 Jul 2016 01:03:13 +0000 (18:03 -0700)]
Don't allow shortcuts with non-main activities
Bug
30122758
Change-Id: Id9ead6706d5460fec3d68c7457e3097f30a9a080
Philip P. Moltmann [Thu, 14 Jul 2016 17:28:56 +0000 (17:28 +0000)]
Merge \"Always trigger a write if no pages are written\" into nyc-mr1-dev
am:
965a706282
Change-Id: Id046f9aef66e0217644116fe8221d05fe5e960a3
Jeff Sharkey [Thu, 14 Jul 2016 16:31:15 +0000 (10:31 -0600)]
Require permission for FLAG_WILL_BE_FOREGROUND.
We caught scheduleAsPackage(), but not schedule(), oops.
Bug:
28998999
Change-Id: I0642c2265ff61eead8747cc6b4d0f852f1ca3ef2
Philip P. Moltmann [Thu, 14 Jul 2016 16:21:10 +0000 (16:21 +0000)]
Merge "Always trigger a write if no pages are written" into nyc-mr1-dev
Wale Ogunwale [Thu, 14 Jul 2016 16:17:59 +0000 (09:17 -0700)]
Allow no longer waiting for visible activity to be stopped.
When process the stop list we remove an activity that was previously
waiting for visible and is now visible from the list and also hide
its windows if it is finishing. However, we don't transition it to the
stopped state because it was waiting for visible. If it is finishing
and the windows are hidden then it makes sense to transition it into
the stopped state since it will not be visible to the user again.
Bug:
30058392
Change-Id: Iac81e2877716ae58d05aed42e1433190a2f70428
Sergio Giro [Tue, 28 Jun 2016 17:26:10 +0000 (18:26 +0100)]
Add bound checks to utf16_to_utf8
Test: ran libaapt2_tests64
Bug:
29250543
Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3
(cherry picked from commit
4781057e78f63e0e99af109cebf3b6a78f4bfbb6)
Dan Sandler [Thu, 14 Jul 2016 14:57:21 +0000 (14:57 +0000)]
WIP debugging.
am:
f3a1f2c7b0
Change-Id: Ia35ee28ca88c06630c6c5b21481c600ec0271db5
Dan Sandler [Sun, 26 Jun 2016 19:59:13 +0000 (15:59 -0400)]
WIP debugging.
Bug:
28524184
Change-Id: I0126b1db0c2346ca8d7511b80464c0239f06eeba
Geoffrey Pitsch [Thu, 14 Jul 2016 14:31:39 +0000 (14:31 +0000)]
Merge \"Fixes delay when playing first sound in BootAnimation\" into nyc-mr1-dev
am:
ebfa6df9a0
Change-Id: Id8b55b666ddd21f5ad767635ff68c2e82edfa2f8
Geoffrey Pitsch [Thu, 14 Jul 2016 14:14:57 +0000 (14:14 +0000)]
Merge "Fixes delay when playing first sound in BootAnimation" into nyc-mr1-dev
Bill Yi [Thu, 14 Jul 2016 13:48:37 +0000 (06:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie48e587beb52623dec3ccefc85daa7b0f53ec037
Auto-generated-cl: translation import
Bill Yi [Thu, 14 Jul 2016 13:33:13 +0000 (06:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I00c813fd0ad16c98cc15eec52a9af333528babfa
Auto-generated-cl: translation import
Sergio Giro [Tue, 28 Jun 2016 17:26:10 +0000 (18:26 +0100)]
Add bound checks to utf16_to_utf8
Test: ran libaapt2_tests64
Bug:
29250543
Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3
(cherry picked from commit
4781057e78f63e0e99af109cebf3b6a78f4bfbb6)
Jason Monk [Wed, 13 Jul 2016 18:22:52 +0000 (14:22 -0400)]
Add LTE+ and update 4G+ icons
Change-Id: Ic91450207921afbfab24cc02d00639d532495c58
Fixes:
30006697
Jason Monk [Thu, 14 Jul 2016 13:22:40 +0000 (13:22 +0000)]
Merge \"QS Detail: Remove up arrow\" into nyc-mr1-dev
am:
cc6e8c4611
Change-Id: Ib943c16d72ec46d053d4160ce581e7ccca7491df
Jason Monk [Thu, 14 Jul 2016 13:08:45 +0000 (13:08 +0000)]
Merge "QS Detail: Remove up arrow" into nyc-mr1-dev
Victor Chang [Tue, 12 Jul 2016 22:47:29 +0000 (23:47 +0100)]
Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set
Fix:
29899712
Change-Id: I38cc9d0e584c3f2674c9ff1d91f77a11479d8943
(cherry picked from commit
9c7b706cf4332b4aeea39c166abca04b56685280)
Rubin Xu [Thu, 14 Jul 2016 09:55:48 +0000 (09:55 +0000)]
Merge \"Fix typo in DevicePolicyManager\" into nyc-mr1-dev
am:
74eb4a5226
Change-Id: I790597626c960f2e9cb3ffcac20f77fc2e001075
Rubin Xu [Thu, 14 Jul 2016 09:46:21 +0000 (09:46 +0000)]
Merge "Fix typo in DevicePolicyManager" into nyc-mr1-dev
Chris Banes [Thu, 14 Jul 2016 09:21:17 +0000 (09:21 +0000)]
Merge \"Read translation and elevation attributes as floats\" into nyc-mr1-dev
am:
6487312544
Change-Id: I22bdfa3abbc85ffb8de7bef62fae0e2e68e2368a
Chris Banes [Thu, 14 Jul 2016 09:11:03 +0000 (09:11 +0000)]
Merge "Read translation and elevation attributes as floats" into nyc-mr1-dev
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:15:00 +0000 (05:15 +0000)]
Merge \"Make Night display off by default\" into nyc-mr1-dev
am:
acef1eb7c6
Change-Id: Ic7de47c6ad8417ab91f2fcf981ba2f7a7828db98
Philip P. Moltmann [Thu, 14 Jul 2016 00:05:03 +0000 (17:05 -0700)]
Always trigger a write if no pages are written
If a previous write was canceled we can end up in the situation where
the layout reports "not changes since layout" but no pages have been
written.
In this case we have to trigger a write even if the layout reports that
nothing changed.
Fixes:
24110832
Change-Id: I4b3f69581e63f4084cd3712861288ded7d9c9249
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: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: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
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: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
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
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
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
OSDN Git Service
