OSDN Git Service
TreeHugger Robot [Fri, 27 May 2016 03:08:37 +0000 (03:08 +0000)]
Merge "Properly check if BT is off when shutting down radios" into nyc-mr1-dev
Julia Reynolds [Fri, 27 May 2016 03:06:10 +0000 (03:06 +0000)]
Merge "Unlocked access of mServices is bad." into nyc-dev
am:
d9599faf6b
* commit '
d9599faf6b872fb5e1db72f7239b21d05050bd47':
Unlocked access of mServices is bad.
Change-Id: I84a2e07aa57e5e25ac1190b4dbfa4005c6d1e572
Julia Reynolds [Fri, 27 May 2016 03:05:42 +0000 (03:05 +0000)]
Merge "Reset slider animator on density change" into nyc-dev
am:
d52a81eeae
* commit '
d52a81eeae2b9b8425a75ee8906ed7b94b5c471a':
Reset slider animator on density change
Change-Id: I75012bd5af8ae07e5917fbffbc18cf1120e09ebc
Fyodor Kupolov [Fri, 27 May 2016 03:05:20 +0000 (03:05 +0000)]
Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev
am:
a4dbdaf5e9
* commit '
a4dbdaf5e96273dccd474e31700d84a1ad907503':
Remove ActivityManager calls with PM.mInstallLock held
Change-Id: I3be800fc5de9fa3c06f0bf6158a0dbf2a05b165e
smain@google.com [Fri, 27 May 2016 03:05:00 +0000 (03:05 +0000)]
add redirect for Espresso Test Recorder doc that will soon be on TAC site. am:
8f60544180 am:
e1bd7e15c5
am:
5d3ca78d3f
* commit '
5d3ca78d3f561e98ae67cf97caa58a4e9e2ed5cd':
add redirect for Espresso Test Recorder doc that will soon be on TAC site.
Change-Id: I339dffae3b9532699c558d406b03a32dabae6517
Paul Jensen [Fri, 27 May 2016 03:04:34 +0000 (03:04 +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
am:
50615e498e
* commit '
50615e498e11f356ef582af0f9616945d04faa80':
Don't pass URL path and username/password to PAC scripts
Change-Id: I2197af29029456780438123c59214c3d8c58a6ef
Christopher Tate [Fri, 27 May 2016 02:58:27 +0000 (02:58 +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
am:
d39c0a8d77
* commit '
d39c0a8d775988bfbf319777b2a17af1579b531a':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: Icd0546a4c3d1e01b356958b78ba143e44061515e
Teng-Hui Zhu [Fri, 27 May 2016 02:50:14 +0000 (02:50 +0000)]
Merge "Update the light center when the root view\'s layout changed" into nyc-dev
am:
e78ba24c17
* commit '
e78ba24c176fd6a0c54eaf7e52be545952ba1ab7':
Update the light center when the root view's layout changed
Change-Id: Ic973b9b47df6550c5170c2248c7e0f2ab25c6a57
Phil Burk [Fri, 27 May 2016 02:49:44 +0000 (02:49 +0000)]
Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev
am:
d34d06606d
* commit '
d34d06606dd5be9fc18029e87cb4b56ecef21864':
AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY
Change-Id: I3c7741fcf914f4e2f6cf89eaec2d72ba519a24b1
Rubin Xu [Fri, 27 May 2016 02:48:59 +0000 (02:48 +0000)]
Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev
am:
1ad12e0678
* commit '
1ad12e0678e87e2ed64dcbc878ee2c7136b5ccdb':
Elaborate on requirement to support PreRebootSecurityLogs
Change-Id: I088c0a0980517d3b4ffa6fe1b1aa9add7620c6e0
Bill Yi [Fri, 27 May 2016 02:47:12 +0000 (02:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
9aed8c2fa0 -s ours
* commit '
9aed8c2fa01785be20cd7cc07976670812bc84a0':
Import translations. DO NOT MERGE
Change-Id: I0305b137eed7ecf9e4b149a0f589e658de16811f
Bill Yi [Fri, 27 May 2016 02:46:32 +0000 (02:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
cb8c569414 -s ours
* commit '
cb8c569414121158adb2a627d4a91b47dd3c4362':
Import translations. DO NOT MERGE
Change-Id: I6ed4074aea21921c930baa71f5564b7dd847618e
Julia Reynolds [Fri, 27 May 2016 02:43:28 +0000 (02:43 +0000)]
Merge "Importance slider updates." into nyc-dev
am:
2bf73e94c3
* commit '
2bf73e94c389bf9457df132d6eaf294f9d35587f':
Importance slider updates.
Change-Id: Ia9d063f6422259f80aeee6fe2d27ca1354538955
Jeff Sharkey [Fri, 27 May 2016 02:42:44 +0000 (02:42 +0000)]
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
am:
36cbf5ca37
* commit '
36cbf5ca378523bfa4f5394e39f5fcff2b2461de':
Cache IMountService for isUserKeyUnlocked() calls.
Change-Id: I1ad2d1eba64a89e7a22dc86c7241f6f85a5f2a0b
Jason Monk [Fri, 27 May 2016 02:42:04 +0000 (02:42 +0000)]
Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev
am:
72f19ff6f0
* commit '
72f19ff6f057fff184c875194e802005f8e8fd08':
QS: Make hotspot go unavailable in airplane mode
Change-Id: Ia21b21a840106fcbd7ca534ee639f43c0487a396
Robin Lee [Fri, 27 May 2016 02:39:45 +0000 (02:39 +0000)]
Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev
am:
33154deb70
* commit '
33154deb700a8cf5df6fff39f0b3291d1278efa0':
Check if we're connected before marking a UID blocked
Change-Id: I7a2552f43c66b1b1adb094d3b91ef87648e57bde
Chris Wren [Fri, 27 May 2016 02:28:03 +0000 (22:28 -0400)]
resolve merge conflicts of
0f97b8f to nyc-mr1-dev
Change-Id: I5e03144e3ae95777eb651add098eabe8af6ad08e
Fyodor Kupolov [Fri, 27 May 2016 00:48:37 +0000 (00:48 +0000)]
Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev
Chris Wren [Thu, 26 May 2016 23:16:27 +0000 (23:16 +0000)]
Merge "boost starred people to at least high importance" into nyc-dev
am:
8e5d7413b8
* commit '
8e5d7413b85a7b202bc917eee4287762b13b864b':
boost starred people to at least high importance
Change-Id: I40d102f3534558894056b2048c629ca955975ca2
Christine Hallstrom [Wed, 25 May 2016 22:49:08 +0000 (15:49 -0700)]
Properly check if BT is off when shutting down radios
Use BluetoothAdapter#getState() instead of
BluetoothAdapter#isEnabled() when checking if Bluetooth has turned
off, as isEnabled() is set to false early in the shutdown process
and getState() provides a better indication of the state of BT.
Bug:
27354612
Change-Id: Ic7828f0726491d49c9a14ba5d654b24f66743662
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
Jonathan Basseri [Thu, 26 May 2016 18:41:17 +0000 (11:41 -0700)]
resolve merge conflicts of
4c04097 to nyc-mr1-dev
Change-Id: I256514588af20985108f72a5e204811904f87c9c
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
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
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
Doris Ling [Thu, 26 May 2016 17:20:53 +0000 (17:20 +0000)]
Merge "Added new action for gesture settings." into nyc-mr1-dev
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
TreeHugger Robot [Thu, 26 May 2016 17:07:23 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 26 May 2016 16:56:12 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 16:55:57 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-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
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
Ji Yang [Thu, 26 May 2016 15:54:27 +0000 (15:54 +0000)]
Merge "Rename carrier messaging API constant." into nyc-dev
am:
f7375b46ff
* commit '
f7375b46ff9848feba0a9632669d07384954d69e':
Rename carrier messaging API constant.
Change-Id: I0e6713e07899cde7780b433c0f3053e344e6d327
Jonathan Basseri [Thu, 26 May 2016 15:50:03 +0000 (15:50 +0000)]
Merge "Change how TelephonyManager handles subscriptions." into nyc-dev
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
Michael Wright [Thu, 26 May 2016 14:38:56 +0000 (14:38 +0000)]
Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
am:
c396f0f70e
* commit '
c396f0f70ef40ea0fb42a0872a13f4c4e9a6a5f0':
DO NOT MERGE Remove Pointer Capture API
Change-Id: I77cb742feacdd3b8af0cf33d4e7ab246f776417f
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
Ricky Wai [Thu, 26 May 2016 14:03:51 +0000 (14:03 +0000)]
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
am:
1cb6f9d8a4
* commit '
1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e':
Add resetKeyStore() in LockSettingsService
Change-Id: I0125a334fac098183e68fa0b9cd24bda64a88fae
Michael Wright [Thu, 26 May 2016 14:03:46 +0000 (14:03 +0000)]
Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
Ricky Wai [Thu, 26 May 2016 14:02:06 +0000 (14:02 +0000)]
Merge "Store work lock type even it uses unified lock" into nyc-dev
am:
610fb8a3f2
* commit '
610fb8a3f2dcdc66dbc4e31d92a08cc249b5ca7b':
Store work lock type even it uses unified lock
Change-Id: I89e322d1f21964074a3deec2fcc9a507c496d36e
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 Prevot [Thu, 26 May 2016 11:06:30 +0000 (11:06 +0000)]
Merge "Use correct user id when checking uri grants for notification." into nyc-dev
am:
19d34821b9
* commit '
19d34821b9c0a74d4269fff0bee87a7f486e1603':
Use correct user id when checking uri grants for notification.
Change-Id: Ic5a0e511f7f844e38fba10adb87a059f83673201
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 09:09:02 +0000 (09:09 +0000)]
Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev
am:
03a1314f2e
* commit '
03a1314f2e9040d48488c7cf38dba273ba669284':
Docs: Update content license page to include Javadocs licenses
Change-Id: I350ceeb794b065cbc735cda75fff010ee31fd9f4
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 08:00:46 +0000 (01:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iceb3a8f6bffa9f71096eb05e483f2b7913289745
Auto-generated-cl: translation import
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:27:26 +0000 (06:27 +0000)]
Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev
am:
40585321d7
* commit '
40585321d7b036ce7f609fbf10e8730deb1ad456':
media: check profile, level and bitrate for isFormatSupported
Change-Id: I55d0e328c5da0fb2eef0f0f1ef57a2b59702c972
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:53:44 +0000 (05:53 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs am:
1ed701493a am:
a7c0788467 am:
1cf99365cb
am:
a283dabdf5
* commit '
a283dabdf51427dfb5b8be0e6ab86292cb56b72d':
Remove spurious url reference.
Change-Id: I9e5ff9472a5434791a4358b92bb40956c2a2e85d
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
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:59:41 +0000 (04:59 +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
am:
86bceb87ca
* commit '
86bceb87ca8177200977024f4757edaf1233d4be':
Track changes to network security config manifest configuration
Change-Id: Ibd6b8e86ec89c3ba0e8c84289255eaef23dcc3b3
Joe Fernandez [Thu, 26 May 2016 04:59:32 +0000 (04:59 +0000)]
Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am:
9e823c7048 am:
1a045584d4
am:
68fb46153f
* commit '
68fb46153f8649e2d4027a5e79cfc1786764a746':
docs: Remove Advertising ID page and redirect to GMS reference docs
Change-Id: I5b0b5eea9e11c88aee9bb91e2e1b38ba2c9042c0
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
Chad Brubaker [Thu, 26 May 2016 04:09:39 +0000 (04:09 +0000)]
Merge "Track changes to network security config manifest configuration" into mnc-mr-docs
Seigo Nonaka [Thu, 26 May 2016 04:07:33 +0000 (04:07 +0000)]
Merge "Fix system locale propagation during user creation." into nyc-dev
am:
ce9f5e3657
* commit '
ce9f5e3657b7a8fb68c6c65a2cd5a27eaf556cc8':
Fix system locale propagation during user creation.
Change-Id: I020babcf2ce1aa632099457f2baf3497f5ac2946
Seigo Nonaka [Thu, 26 May 2016 03:51:38 +0000 (03:51 +0000)]
Merge "Fix system locale propagation during user creation." into nyc-dev
Dirk Dougherty [Thu, 26 May 2016 03:29:59 +0000 (20:29 -0700)]
Remove spurious url reference.
Change-Id: I35e5869ed71677b11af8c451a16661faa896ca1f
Trevor Johns [Thu, 26 May 2016 02:36:37 +0000 (02:36 +0000)]
docs: Fix broken link in Volley training am:
05dd9d2c29 am:
346114e346 am:
c8c2abed0e am:
46c1d5a5d2
am:
5513b6776e
* commit '
5513b6776e0b00fd0444cf4f964451d0ef61a511':
docs: Fix broken link in Volley training
Change-Id: Iae7c07a4734cd822c13ba8a78d5bc8b311432eb9
Trevor Johns [Thu, 26 May 2016 02:19:23 +0000 (02:19 +0000)]
docs: Fix broken link in Volley training am:
05dd9d2c29 am:
346114e346 am:
c8c2abed0e
am:
46c1d5a5d2
* commit '
46c1d5a5d2b4c1d6a680f7af5c3973486c1fef2c':
docs: Fix broken link in Volley training
Change-Id: Ib5ae3925cca39db0145bb4c6e6eeb53488bfc316
OSDN Git Service
