OSDN Git Service
Android Build Merger (Role) [Thu, 26 May 2016 23:10:20 +0000 (23:10 +0000)]
Merge "Merge "docs: Refinements for testing" into mnc-io-docs am:
9da0730d66 am:
feb0b87230" into nyc-dev
Android Build Merger (Role) [Thu, 26 May 2016 23:10:12 +0000 (23:10 +0000)]
Merge "Updated link to material design page. am:
ff05383baf am:
ee44b14cd4" into nyc-dev
Bert McMeen [Thu, 26 May 2016 23:09:40 +0000 (23:09 +0000)]
Merge "docs: Refinements for testing" into mnc-io-docs am:
9da0730d66
am:
feb0b87230
* commit '
feb0b87230c28b2303da217c07177f00b52e87d0':
docs: Refinements for testing
Change-Id: Ieecec450459bcb175979a3ef3ddccb6161a598e2
sreevanis [Thu, 26 May 2016 23:09:34 +0000 (23:09 +0000)]
Updated link to material design page. am:
ff05383baf
am:
ee44b14cd4
* commit '
ee44b14cd44bf0576859bd0c9519ab0e61e063f8':
Updated link to material design page.
Change-Id: Iaf4bc31d8541e75d3840e6c6f5aa5f667e0baf42
John Reck [Thu, 26 May 2016 23:07:52 +0000 (23:07 +0000)]
Merge "Change overdraw test to use windowbackground" into nyc-dev
Kevin Hufnagle [Thu, 26 May 2016 23:06:42 +0000 (23:06 +0000)]
Merge "resolve merge conflicts of
7f7eec3 to nyc-dev" into nyc-dev
Bert McMeen [Thu, 26 May 2016 22:49:04 +0000 (22:49 +0000)]
Merge "docs: Refinements for testing" into mnc-io-docs
am:
9da0730d66
* commit '
9da0730d66b36b11a93e147857f62e641ac76276':
docs: Refinements for testing
Change-Id: I981bf909a77f680854064e5a45e9fad0aef07425
Bert McMeen [Thu, 26 May 2016 22:43:54 +0000 (22:43 +0000)]
Merge "docs: Refinements for testing" into mnc-io-docs
Selim Cinek [Thu, 26 May 2016 22:33:49 +0000 (22:33 +0000)]
Merge "Fixed the relative time spoken with accessibility" into nyc-dev
Chris Tate [Thu, 26 May 2016 22:32:44 +0000 (22:32 +0000)]
Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev
Bert McMeen [Thu, 26 May 2016 17:47:23 +0000 (10:47 -0700)]
docs: Refinements for testing
Bug:
28964312
Change-Id: Ie98b74860659046199f8ee920d1cd4899a9c7ce6
Jorim Jaggi [Wed, 25 May 2016 21:14:46 +0000 (14:14 -0700)]
Fix toast with accessibility and app pinning
Bug:
28912468
Change-Id: Ica33ba691bbcb921c5d3e953890498c04bb624e3
sreevanis [Thu, 26 May 2016 22:21:29 +0000 (22:21 +0000)]
Updated link to material design page.
am:
ff05383baf
* commit '
ff05383baf0027dbb04cfa588a80f5d8806bf8aa':
Updated link to material design page.
Change-Id: Ic56e38ad1b18c324577586a979364c8e1d0edf3a
George Mount [Thu, 26 May 2016 22:15:31 +0000 (22:15 +0000)]
Merge "Fix Activity Transition mess-up." into nyc-dev
sreevanis [Thu, 26 May 2016 22:06:13 +0000 (15:06 -0700)]
Updated link to material design page.
Bug:
28983647
Change-Id: Ic4ca199ca71d3cbfc3ffde477b423aebbf626ac1
Wyatt Riley [Thu, 26 May 2016 22:03:25 +0000 (22:03 +0000)]
Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev
Kevin Hufnagle [Thu, 26 May 2016 21:57:15 +0000 (14:57 -0700)]
resolve merge conflicts of
7f7eec3 to nyc-dev
Change-Id: I35b5b7103b89e0e12e21e809a3d3952738c9a668
John Reck [Thu, 26 May 2016 21:36:42 +0000 (14:36 -0700)]
Change overdraw test to use windowbackground
Bug:
28786023
Fixes an issue where the first couple frames would
be extremely slow due to the simpleness of HWUI's
overdraw rejection optimization.
Change-Id: I1fe3d83f7e2e0eb3299124b00b9f877c2c3aebf9
Alan Viverette [Thu, 26 May 2016 21:20:01 +0000 (21:20 +0000)]
Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev
Kevin Hufnagle [Thu, 26 May 2016 20:59:57 +0000 (20:59 +0000)]
Merge "Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page." into mnc-io-docs
am:
f23477385e
* commit '
f23477385edbf1e8ecc8c280867fb39698da4b8d':
Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.
Change-Id: I59ebda20856fd90f50968f9a341b8f87ce2bd9c1
Kevin Hufnagle [Thu, 26 May 2016 20:55:55 +0000 (20:55 +0000)]
Merge "Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page." into mnc-io-docs
Alan Viverette [Thu, 26 May 2016 20:49:29 +0000 (16:49 -0400)]
Prevent callbacks during DrawableContainer child initialization
Bug:
28900939
Change-Id: I9c6c8af1665c2dc0bfa8bc8fc773c81e14f6aab1
Winson Chung [Thu, 26 May 2016 20:39:27 +0000 (20:39 +0000)]
Merge "Fixing crash in SysUI due to invalid group." into nyc-dev
Daniel Sandler [Thu, 26 May 2016 20:07:08 +0000 (20:07 +0000)]
Merge "Time to #NameAndroidN!" into nyc-dev
Jeff Sharkey [Thu, 26 May 2016 20:04:14 +0000 (20:04 +0000)]
Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev
Jeff Sharkey [Thu, 26 May 2016 20:03:40 +0000 (20:03 +0000)]
Merge "Careful process validation for unaware providers." into nyc-dev
Winson [Thu, 26 May 2016 17:46:11 +0000 (10:46 -0700)]
Fixing crash in SysUI due to invalid group.
- Adding a null check for tasks that have already been removed, but may
be launched.
Bug:
28890599
Change-Id: Idde322c737a5543e639e693fbe7615e720a12c1e
Winson [Wed, 25 May 2016 17:53:53 +0000 (10:53 -0700)]
Defer calling the stack task removed callbacks.
- When updating a TaskStack, defer calling any callbacks until the stack
is updated. Otherwise, the handler may incorrectly check the size of
the stack to be empty, which triggers Recents to go home.
- This CL also removes an erroneous double call to onStackTaskRemoved()
when updating, one explicit call and the call that is made internally
in removeTask().
Bug:
28941269
Change-Id: I37b93bd959a625096925a16a426269a0c79de4e7
Jeff Sharkey [Thu, 26 May 2016 19:53:16 +0000 (19:53 +0000)]
Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev
Adam Cohen [Thu, 26 May 2016 19:44:22 +0000 (19:44 +0000)]
Merge "Replace caribou wallpaper without the stars b/
28339724" into nyc-dev
Eric Schmidt [Thu, 26 May 2016 19:35:13 +0000 (19:35 +0000)]
Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am:
8e08dbe8f8
am:
400aed3556
* commit '
400aed3556d837e746252e1be03dd1ac54a383e5':
docs: Removing CLI steps in getting started docs
Change-Id: Id585f59925373bda46a34c9bd6811603ea5ee66a
Eric Schmidt [Thu, 26 May 2016 19:30:14 +0000 (19:30 +0000)]
Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs
am:
8e08dbe8f8
* commit '
8e08dbe8f825e2de9cd79bf155a255543efb4c6c':
docs: Removing CLI steps in getting started docs
Change-Id: If7ce2cdf3f9b27dd8f7ab36a83fe38d26a70e7ca
Eric Schmidt [Thu, 26 May 2016 19:26:31 +0000 (19:26 +0000)]
Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs
Eric Schmidt [Tue, 24 May 2016 22:50:59 +0000 (15:50 -0700)]
docs: Removing CLI steps in getting started docs
Bug:
22875456
Bug:
21026809
Change-Id: I8f4fcca73c779407aac0b96299c60f8d6adae214
Julia Reynolds [Thu, 26 May 2016 18:46:38 +0000 (18:46 +0000)]
Merge "Unlocked access of mServices is bad." into nyc-dev
Julia Reynolds [Thu, 26 May 2016 18:46:09 +0000 (18:46 +0000)]
Merge "Reset slider animator on density change" into nyc-dev
Fyodor Kupolov [Thu, 26 May 2016 18:20:35 +0000 (18:20 +0000)]
Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev
smain@google.com [Thu, 26 May 2016 18:05:08 +0000 (18:05 +0000)]
add redirect for Espresso Test Recorder doc that will soon be on TAC site. am:
8f60544180
am:
e1bd7e15c5
* commit '
e1bd7e15c5958769025ba5c8bbf0d18d8e9bfb20':
add redirect for Espresso Test Recorder doc that will soon be on TAC site.
Change-Id: I9a5f32d1828970a96dea0a31e62e1b80f564fed4
Jeff Sharkey [Thu, 26 May 2016 17:02:28 +0000 (11:02 -0600)]
Delay PACKAGE_RESTARTED until after data cleared.
Some system internals are using the PACKAGE_RESTARTED broadcast to
rebind to services, which would fail if the package was still frozen
due to a long-running clear data operation. To avoid this, delay both
the PACKAGE_RESTARTED and PACKAGE_DATA_CLEARED broadcasts until after
the clear operation has finished.
Bug:
28964281
Change-Id: I18ac36c39ba90498b1eb0cc495da1f16c24614bf
Jeff Sharkey [Wed, 25 May 2016 17:06:20 +0000 (11:06 -0600)]
Careful process validation for unaware providers.
When unlocking a user, install any direct boot unaware providers into
processes that were started before unlock. Mirror the conditional
logic used in all other provider locations.
Bug:
28708253
Change-Id: I2044558456d7f8e509374659f7c89abf01869cd9
Paul Jensen [Thu, 26 May 2016 17:59:23 +0000 (17:59 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141 am:
6c35cf2434 am:
42a5983364 am:
75095e6f02 am:
7c625e1938 am:
54a62d5feb am:
a5a2c88fb3 am:
7ff57eaff9
am:
94c8855da6
* commit '
94c8855da6c1e5800723d1eaeceb1cba841bea6b':
Don't pass URL path and username/password to PAC scripts
Change-Id: Ic91dc5c4a0a283bcd177daac8cced12a668bf0d9
smain@google.com [Thu, 26 May 2016 17:59:11 +0000 (17:59 +0000)]
add redirect for Espresso Test Recorder doc that will soon be on TAC site.
am:
8f60544180
* commit '
8f60544180374beaab837bc0f3225e54d0d368a5':
add redirect for Espresso Test Recorder doc that will soon be on TAC site.
Change-Id: I55f32372b245d136519e55e8dd79796f58a6231f
Christopher Tate [Thu, 26 May 2016 17:56:38 +0000 (17:56 +0000)]
DO NOT MERGE : backport of backup transport whitelist am:
647cb6a6d8 -s ours am:
077534b101 am:
4c559cdade am:
24ceca96af -s ours am:
88c9eae886 am:
1fa817c057 am:
040cf14047
am:
0905c8f398 -s ours
* commit '
0905c8f3989ab607b659fdc20a1b9a56794d2b6f':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: I6d0b878ea43d98761b93865604e8cb97410cdea9
Kevin Hufnagle [Fri, 29 Apr 2016 17:40:47 +0000 (10:40 -0700)]
Cherry pick: docs: Edited "Features Reference" section in
"<uses-feature>" page.
The "Features Reference" section now lists all hardware and software
features that apps can use on devices running Marshmallow, and some
existing features now have more descriptive examples.
Converted the tables listing hardware and software features to h4
elements and definition lists to make the page more reader-friendly,
particularly on handheld devices.
Bug:
27803596
Change-Id: I3490f5dcde6a838d69940c70e06d9cd2cb8a7bdc
Julia Reynolds [Thu, 26 May 2016 17:49:17 +0000 (13:49 -0400)]
Unlocked access of mServices is bad.
Change-Id: I626d2daffb3669c7bea4856f8ee66dbd13951163
Fixes:
28979051
Tenghui Zhu [Thu, 26 May 2016 17:48:48 +0000 (17:48 +0000)]
Merge "Update the light center when the root view's layout changed" into nyc-dev
Phil Burk [Thu, 26 May 2016 17:46:07 +0000 (17:46 +0000)]
Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev
Julia Reynolds [Thu, 26 May 2016 17:43:38 +0000 (13:43 -0400)]
Reset slider animator on density change
Change-Id: Iae7d32746c6ea2cabe7d0d58ff11a05d1722fce4
Fixes:
28626591
Phil Burk [Wed, 25 May 2016 22:13:57 +0000 (15:13 -0700)]
AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY
Explain buffer size optimization.
This CL has no code changes, just documentation changes.
Bug:
28802853
Change-Id: I91942f00a3e9691e4fc05b24656b8bf4cb538bc2
Signed-off-by: Phil Burk <philburk@google.com>
smain@google.com [Thu, 26 May 2016 17:33:07 +0000 (10:33 -0700)]
add redirect for Espresso Test Recorder doc that will soon be on TAC site.
Change-Id: Ied13eedb15940b4a52562beffc9ea7652a0c4c76
Manoja Wijewardene [Thu, 26 May 2016 17:20:48 +0000 (17:20 +0000)]
Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 17:07:54 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
George Mount [Thu, 26 May 2016 16:52:53 +0000 (09:52 -0700)]
Fix Activity Transition mess-up.
Bug
28610520
isTopOfTask() was returns false in onResume always because
it wasn't being made visible until after onResume. The visibility
of the window is not important for this method (older versions
didn't check it at all), so that was removed.
Change-Id: I45e506e72356cc3808e2e9340739726c99da7d97
TreeHugger Robot [Thu, 26 May 2016 16:56:12 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Julia Reynolds [Thu, 26 May 2016 16:50:56 +0000 (16:50 +0000)]
Merge "Importance slider updates." into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 16:49:49 +0000 (16:49 +0000)]
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
Dan Sandler [Thu, 26 May 2016 03:13:32 +0000 (23:13 -0400)]
Time to #NameAndroidN!
Bug:
27376882
Change-Id: I32397e634039a64b86669662908fab2effb367a7
Jason Monk [Thu, 26 May 2016 16:46:47 +0000 (16:46 +0000)]
Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev
Robin Lee [Thu, 26 May 2016 16:42:16 +0000 (16:42 +0000)]
Merge "Check if we're connected before marking a UID blocked" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 16:35:28 +0000 (16:35 +0000)]
Merge "add metrics for notification and group expansion" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 16:35:20 +0000 (16:35 +0000)]
Merge "boost starred people to at least high importance" into nyc-dev
Jonathan Basseri [Thu, 26 May 2016 15:50:03 +0000 (15:50 +0000)]
Merge "Change how TelephonyManager handles subscriptions." into nyc-dev
Jeff Sharkey [Thu, 26 May 2016 15:47:43 +0000 (09:47 -0600)]
Suppress unlock notifications on non-FBE devices.
We have a longer-term plan to clean up FBE unlock notifications, but
in the meantime don't confuse users by quickly flashing them on
non-FBE devices.
Bug:
28840764
Change-Id: I696508ef981b6f8f51f22ea24487d87d27d5b6e3
Ji Yang [Thu, 26 May 2016 15:40:11 +0000 (15:40 +0000)]
Merge "Rename carrier messaging API constant." into nyc-dev
Jeff Sharkey [Thu, 26 May 2016 15:31:04 +0000 (09:31 -0600)]
Cache IMountService for isUserKeyUnlocked() calls.
This avoids doing a ServiceManager lookup for every call through
this hot code-path.
Bug:
28946245
Change-Id: I210ce34b33e5b40a5ab4e92ddce87fc5e9964be2
Robin Lee [Tue, 24 May 2016 15:35:10 +0000 (16:35 +0100)]
Check if we're connected before marking a UID blocked
This kills the always-on test, and any third-party app that correctly
checks whether it's blocked before attempting to make a connection.
Only affects always-on VPN when lockdown=true.
Bug:
28909500
Change-Id: I87aa9598d3872ae2ec409c2b19d73052c21ec878
Paul Jensen [Thu, 26 May 2016 15:22:55 +0000 (15:22 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141 am:
6c35cf2434 am:
42a5983364 am:
75095e6f02 am:
7c625e1938 am:
54a62d5feb am:
a5a2c88fb3
am:
7ff57eaff9
* commit '
7ff57eaff95fd4cdb3cc80f8e420b469f0656bb8':
Don't pass URL path and username/password to PAC scripts
Change-Id: I80187f003e437678786f0740f23e76543890b9bc
Paul Jensen [Thu, 26 May 2016 15:13:07 +0000 (15:13 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141 am:
6c35cf2434 am:
42a5983364 am:
75095e6f02 am:
7c625e1938 am:
54a62d5feb
am:
a5a2c88fb3
* commit '
a5a2c88fb3ac43315575de94696c837cb6b88c35':
Don't pass URL path and username/password to PAC scripts
Change-Id: Ia33d40ae5d4b6ee0cd3cfcdc8587d6002603f128
Julia Reynolds [Thu, 26 May 2016 15:07:49 +0000 (11:07 -0400)]
Importance slider updates.
Icon & tint.
Bug:
28911161
Change-Id: Id8c3a4b79326eb5073a600de49ac14ae7223b398
Paul Jensen [Thu, 26 May 2016 15:02:46 +0000 (15:02 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141 am:
6c35cf2434 am:
42a5983364 am:
75095e6f02 am:
7c625e1938
am:
54a62d5feb
* commit '
54a62d5febc8771f65221db3dd5c6e08f3288eb8':
Don't pass URL path and username/password to PAC scripts
Change-Id: I1da24c02fbf85a7f0fd3ea7a86ad3a34389000e8
Jason Monk [Wed, 25 May 2016 18:22:01 +0000 (14:22 -0400)]
QS: Make hotspot go unavailable in airplane mode
Put the hotspot tile in the unavailable state whenever airplane
mode is on.
Change-Id: I7a6eb54c2e89a7a9736c72d8e58ab58e7e82d0a6
Fixes:
28881032
Paul Jensen [Thu, 26 May 2016 14:50:37 +0000 (14:50 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141 am:
6c35cf2434 am:
42a5983364 am:
75095e6f02
am:
7c625e1938
* commit '
7c625e1938f28cf2a455fb1f4ab71dca99341b3d':
Don't pass URL path and username/password to PAC scripts
Change-Id: If2e068e47e6efd4b8ad7abc7fb358860b188a380
Paul Jensen [Thu, 26 May 2016 14:35:08 +0000 (14:35 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141 am:
6c35cf2434 am:
42a5983364
am:
75095e6f02
* commit '
75095e6f02b13d070bb74b019ab6392f0f7b1105':
Don't pass URL path and username/password to PAC scripts
Change-Id: I0da4c878a1bd78837abc40a3ab332c6a1e781d3e
Paul Jensen [Thu, 26 May 2016 14:13:16 +0000 (14:13 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141 am:
6c35cf2434
am:
42a5983364
* commit '
42a59833648243a8ac3aec7adf7f4ca0d3babdd1':
Don't pass URL path and username/password to PAC scripts
Change-Id: Id92ff5deed707c029fc6d5806aff2a324961c2ec
Michael Wright [Thu, 26 May 2016 14:03:46 +0000 (14:03 +0000)]
Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
Paul Jensen [Thu, 26 May 2016 14:01:19 +0000 (14:01 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141
am:
6c35cf2434
* commit '
6c35cf2434ca373196b16620455f8f234b63d594':
Don't pass URL path and username/password to PAC scripts
Change-Id: I9bbca312129011822fc5ea95682bac5ca4258ced
Ricky Wai [Thu, 26 May 2016 13:46:25 +0000 (13:46 +0000)]
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
Ricky Wai [Thu, 26 May 2016 13:46:11 +0000 (13:46 +0000)]
Merge "Store work lock type even it uses unified lock" into nyc-dev
Paul Jensen [Thu, 26 May 2016 13:44:37 +0000 (13:44 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff
am:
bb27626141
* commit '
bb2762614181a0ee03554a96c070ea1006d7263c':
Don't pass URL path and username/password to PAC scripts
Change-Id: I9e4d3282765dec1554955b9f72484e9d7e2d6594
Paul Jensen [Thu, 26 May 2016 13:37:24 +0000 (13:37 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff
am:
8940d2b0ff
* commit '
8940d2b0ff2fb5a9cc9e12be8a7959670e4390ac':
Don't pass URL path and username/password to PAC scripts
Change-Id: I03d6273d7ddaecac071ab3d1207d3d684e80159e
Paul Jensen [Thu, 26 May 2016 13:30:59 +0000 (13:30 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev
am:
af0b4466ff
* commit '
af0b4466ffe2ed09b288014d1d3a9ed308fe3c76':
Don't pass URL path and username/password to PAC scripts
Change-Id: I8a49a29ed1999ab811d3306dc46769d83c05244e
Paul Jensen [Thu, 26 May 2016 13:18:04 +0000 (13:18 +0000)]
Merge "Don't pass URL path and username/password to PAC scripts" into klp-dev
Christopher Tate [Thu, 26 May 2016 12:52:19 +0000 (12:52 +0000)]
DO NOT MERGE : backport of backup transport whitelist am:
647cb6a6d8 -s ours am:
077534b101 am:
4c559cdade am:
24ceca96af -s ours am:
88c9eae886 am:
1fa817c057
am:
040cf14047
* commit '
040cf14047fb025f603c73e56a9bfd06c84a2483':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: I3f6a42a6a1c3492439a8a7a93537de52a6f1cf1f
Christopher Tate [Thu, 26 May 2016 12:31:55 +0000 (12:31 +0000)]
DO NOT MERGE : backport of backup transport whitelist am:
647cb6a6d8 -s ours am:
077534b101 am:
4c559cdade am:
24ceca96af -s ours am:
88c9eae886
am:
1fa817c057
* commit '
1fa817c057c909d1ba4f5a356f6eb4b52a3bc628':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: Ia409bff3b5db1ba686d884f81e45b242ec1ae38f
Nicolas Prévot [Thu, 26 May 2016 10:37:31 +0000 (10:37 +0000)]
Merge "Use correct user id when checking uri grants for notification." into nyc-dev
Yi Kong [Thu, 26 May 2016 08:54:56 +0000 (08:54 +0000)]
Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev
Bill Yi [Thu, 26 May 2016 07:41:49 +0000 (00:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I20074824d92bd827a9f12d13f659d52286be1007
Auto-generated-cl: translation import
Lajos Molnar [Thu, 26 May 2016 06:14:03 +0000 (06:14 +0000)]
Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev
Dirk Dougherty [Thu, 26 May 2016 05:44:29 +0000 (05:44 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs am:
1ed701493a am:
a7c0788467
am:
1cf99365cb
* commit '
1cf99365cb98174bd4300c7f0c799e94f6aab907':
Remove spurious url reference.
Change-Id: I744e556ebdb729314542dd9115346d42daf63e09
Dirk Dougherty [Thu, 26 May 2016 05:35:46 +0000 (05:35 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs am:
1ed701493a
am:
a7c0788467
* commit '
a7c0788467d865e72ddbaa5862382d8ecc164039':
Remove spurious url reference.
Change-Id: Ifb9a772d89c60124334b3a78a2f5864f879d104f
Dirk Dougherty [Thu, 26 May 2016 05:17:01 +0000 (05:17 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs
am:
1ed701493a
* commit '
1ed701493a6363c58b86de8dac600fca990a131a':
Remove spurious url reference.
Change-Id: I6b304fe5f87804f9c0d4de9bfef92437810ac9ea
Hyunyoung Song [Thu, 26 May 2016 05:10:55 +0000 (22:10 -0700)]
Replace caribou wallpaper without the stars
b/
28339724
Change-Id: I1c7f9024ffbdd51f675996ef156bc4882588da30
Dirk Dougherty [Thu, 26 May 2016 05:03:24 +0000 (05:03 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs
Chad Brubaker [Thu, 26 May 2016 04:47:44 +0000 (04:47 +0000)]
Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am:
c0f99aebdc" into mnc-io-docs am:
ce99e3c571
am:
11b56641e5
* commit '
11b56641e5e466f5ca14bd118e819c3f04820d38':
Track changes to network security config manifest configuration
Change-Id: I25e463154d084223dbafdf3e2ab99bfdb52769fb
Joe Fernandez [Thu, 26 May 2016 04:47:34 +0000 (04:47 +0000)]
Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am:
9e823c7048
am:
1a045584d4
* commit '
1a045584d44030947793f2a48953ce54ff2df0c6':
docs: Remove Advertising ID page and redirect to GMS reference docs
Change-Id: If2ede00cf1ab2bdb178eed09ec6f9cd6d28f8820
Chad Brubaker [Thu, 26 May 2016 04:37:17 +0000 (04:37 +0000)]
Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am:
c0f99aebdc" into mnc-io-docs
am:
ce99e3c571
* commit '
ce99e3c57133b4418be4f0e2c8bc7dd9ea2815d2':
Track changes to network security config manifest configuration
Change-Id: I6a09710dcef8b19c429f28fa90d72fd38284de3e
Joe Fernandez [Thu, 26 May 2016 04:37:09 +0000 (04:37 +0000)]
Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs
am:
9e823c7048
* commit '
9e823c7048bce9373fd5ccf10003b2eb05175b2b':
docs: Remove Advertising ID page and redirect to GMS reference docs
Change-Id: Ie5649d42ece35f36130abefd00c3a53d5252cd03
Android Build Merger (Role) [Thu, 26 May 2016 04:26:32 +0000 (04:26 +0000)]
Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am:
c0f99aebdc" into mnc-io-docs
Joe Fernandez [Thu, 26 May 2016 04:26:24 +0000 (04:26 +0000)]
Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs
Chad Brubaker [Thu, 26 May 2016 04:26:11 +0000 (04:26 +0000)]
Merge "Track changes to network security config manifest configuration" into mnc-mr-docs
am:
c0f99aebdc
* commit '
c0f99aebdc7c803600e12cbe0d940219069eb066':
Track changes to network security config manifest configuration
Change-Id: I46fc434934428ffbdfd7816c0a3b2590f97d4713
OSDN Git Service
