OSDN Git Service
Jeff Sharkey [Thu, 9 Feb 2017 17:37:47 +0000 (17:37 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e
am:
47656a3cbd
Change-Id: I5835528fe288b1ee117265d37e39fcfd0bbb301b
Jeff Sharkey [Thu, 9 Feb 2017 17:33:51 +0000 (17:33 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours
am:
be0dab477e
Change-Id: I28971e3707b67f7f3e4a566fd4f8e891d7e8823b
Jeff Sharkey [Thu, 9 Feb 2017 17:33:43 +0000 (17:33 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
3eddf40675
Change-Id: Ied7f446ac2e539654b9f7d5e1ab7cce8aec7390e
Jeff Sharkey [Thu, 9 Feb 2017 17:28:44 +0000 (17:28 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
a78841ebd4 -s ours
Change-Id: Iac6ae6f87a60318e4557b238c196c3b0627e95ab
TreeHugger Robot [Wed, 8 Feb 2017 23:36:06 +0000 (23:36 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev
Greg Plesur [Wed, 8 Feb 2017 19:57:34 +0000 (14:57 -0500)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()
BUG:
34824902
Change-Id: I49d4d7043829862e1abacb3f400a6690f454d6c0
Erik Wolsheimer [Wed, 8 Feb 2017 04:54:20 +0000 (20:54 -0800)]
DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked
BUG:
34312358
Change-Id: I9b303d443b082bba8b440e6e1ef68b050a970386
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself. Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.
Test: builds, boots, send/recv MMS works in primary/secondary users
Bug:
33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit
7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself. Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.
Test: builds, boots, send/recv MMS works in primary/secondary users
Bug:
33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit
7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
Aaron Whyte [Mon, 6 Feb 2017 22:49:32 +0000 (22:49 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev
Ricardo Loo [Mon, 6 Feb 2017 20:45:27 +0000 (20:45 +0000)]
Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev
am:
19dae584ba
Change-Id: I401682a35913ed936d124f7265e3e9338335ccee
Ricardo Loo [Mon, 6 Feb 2017 20:45:23 +0000 (20:45 +0000)]
docs: Update gluUnProject parameter description.
am:
232c4900ac
Change-Id: I087f08225229483798997096be428ef89f61d0bb
Ricardo Loo [Mon, 6 Feb 2017 20:37:43 +0000 (20:37 +0000)]
Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev
Agnieszka Madurska [Mon, 6 Feb 2017 19:30:27 +0000 (19:30 +0000)]
Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev
Ying Wai (Daniel) Fan [Wed, 1 Feb 2017 06:00:10 +0000 (22:00 -0800)]
Prevent division-by-zero error when calculating battery capacity.
Bug:
34255953
Change-Id: Ie072cd5dc26faf17e8ab46ea0795750396f087c2
Fixes:
34255953
Test: formula change CL. No existing unit tests found.
Pavel Grafov [Mon, 6 Feb 2017 17:41:12 +0000 (17:41 +0000)]
Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev
am:
504ca8e41a
Change-Id: I9f880a65827d689aa379ff54138f54422048a59c
Pavel Grafov [Mon, 6 Feb 2017 17:41:08 +0000 (17:41 +0000)]
Fix the documentation for SecurityLog.SecurityEvent.getData().
am:
739cda8f31
Change-Id: I0c6f1271392bfc9cc8d253d5fa5e029213492b48
Pavel Grafov [Mon, 6 Feb 2017 17:35:04 +0000 (17:35 +0000)]
Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev
Aga Madurska [Tue, 31 Jan 2017 13:24:02 +0000 (13:24 +0000)]
Use correct APIs to detect conditions for round scrollbars.
Bug:
34876394
Test: Performed manually.
Change-Id: I9e690e99fd8d925c589ebd19d9c6754eeb63b1d8
Ricardo Loo [Sat, 4 Feb 2017 00:38:01 +0000 (18:38 -0600)]
docs: Update gluUnProject parameter description.
Adding missing variable in the output vector.
Originally reported in
http://code.google.com/p/android/issues/detail?id=25143
Change-Id: I91d9ce7e53a9d9cdd890899a0edd49830d533b9b
Bug:
5991013
Jeff Sharkey [Fri, 3 Feb 2017 01:24:20 +0000 (01:24 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am:
3e4faac39f -s ours am:
b058dc139d am:
d20b04a41d -s ours am:
4b0164b27c am:
00af0a6d2c am:
b4c5c522e3 am:
4d1c25ec43 -s ours am:
43f79eec8b am:
cecf30c3a2
am:
5a50d2b12c
Change-Id: I32bf2850fe25f5e0ec9df96042da467a21d90990
Jeff Sharkey [Fri, 3 Feb 2017 01:23:23 +0000 (01:23 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
2dfdf662d0 -s ours am:
4a4b6bfafb am:
61e9179646 -s ours am:
9346bec730 am:
c0cc8695a5 am:
f51e8e8642 am:
bf16fab4e7 -s ours am:
65b0a6f596 am:
6f47221263
am:
47bfa0ab25
Change-Id: I68ffb4a6973c8af213030ea441fbe2b93353fa9f
Jeff Sharkey [Fri, 3 Feb 2017 01:22:20 +0000 (01:22 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am:
6d3573e530 am:
5d65931af5 -s ours am:
f82c373074 am:
8c9ff68173 am:
4b3c59005b am:
394357761e -s ours am:
bafa3c1d3b am:
7cd3c47c29
am:
770eff87cd
Change-Id: I8aa0ade785b829b34490c3dbe80397fe7fb6bd3c
Jeff Sharkey [Fri, 3 Feb 2017 01:19:19 +0000 (01:19 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
6f13f73b73 am:
73f95823f8 -s ours am:
05749525a5 am:
bd2bec9164 am:
1ddaf2f96b am:
56131cf7c0 -s ours am:
cdb996355e am:
d2a9d6fa27
am:
8d9953964a
Change-Id: I85e2fcd6e4ab5d5183318db129ae17d5d2376005
Jeff Sharkey [Fri, 3 Feb 2017 01:15:15 +0000 (01:15 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am:
3e4faac39f -s ours am:
b058dc139d am:
d20b04a41d -s ours am:
4b0164b27c am:
00af0a6d2c am:
b4c5c522e3 am:
4d1c25ec43 -s ours am:
43f79eec8b
am:
cecf30c3a2
Change-Id: I3737e39d6433792abcd4f78bbf19dc19596f582e
Jeff Sharkey [Fri, 3 Feb 2017 01:14:17 +0000 (01:14 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
2dfdf662d0 -s ours am:
4a4b6bfafb am:
61e9179646 -s ours am:
9346bec730 am:
c0cc8695a5 am:
f51e8e8642 am:
bf16fab4e7 -s ours am:
65b0a6f596
am:
6f47221263
Change-Id: I8736bfebc8038f24628387444bc656c103fcdf36
Jeff Sharkey [Fri, 3 Feb 2017 01:13:24 +0000 (01:13 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am:
6d3573e530 am:
5d65931af5 -s ours am:
f82c373074 am:
8c9ff68173 am:
4b3c59005b am:
394357761e -s ours am:
bafa3c1d3b
am:
7cd3c47c29
Change-Id: I91895a68c262cce27738b106c6f5d1b75a311b73
Jeff Sharkey [Fri, 3 Feb 2017 01:12:38 +0000 (01:12 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
6f13f73b73 am:
73f95823f8 -s ours am:
05749525a5 am:
bd2bec9164 am:
1ddaf2f96b am:
56131cf7c0 -s ours am:
cdb996355e
am:
d2a9d6fa27
Change-Id: I206033dd081f2c7a04364815d8760261b87b435c
Jeff Sharkey [Fri, 3 Feb 2017 01:07:09 +0000 (01:07 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am:
3e4faac39f -s ours am:
b058dc139d am:
d20b04a41d -s ours am:
4b0164b27c am:
00af0a6d2c am:
b4c5c522e3 am:
4d1c25ec43 -s ours
am:
43f79eec8b
Change-Id: I46242f1ea9d7a2e63267c1d3d77c6ab3c5957435
Jeff Sharkey [Fri, 3 Feb 2017 01:06:20 +0000 (01:06 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
2dfdf662d0 -s ours am:
4a4b6bfafb am:
61e9179646 -s ours am:
9346bec730 am:
c0cc8695a5 am:
f51e8e8642 am:
bf16fab4e7 -s ours
am:
65b0a6f596
Change-Id: Icf99c3f53e7281792db74ba5902ebf168bf07944
Jeff Sharkey [Fri, 3 Feb 2017 01:05:28 +0000 (01:05 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am:
6d3573e530 am:
5d65931af5 -s ours am:
f82c373074 am:
8c9ff68173 am:
4b3c59005b am:
394357761e -s ours
am:
bafa3c1d3b
Change-Id: Ifacdf34a063571d521dc635003ddabb3228460d4
Jeff Sharkey [Fri, 3 Feb 2017 01:04:24 +0000 (01:04 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
6f13f73b73 am:
73f95823f8 -s ours am:
05749525a5 am:
bd2bec9164 am:
1ddaf2f96b am:
56131cf7c0 -s ours
am:
cdb996355e
Change-Id: I5129414295d369564a603da928f19ee6b74d2d9f
Jeff Sharkey [Fri, 3 Feb 2017 00:59:32 +0000 (00:59 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am:
3e4faac39f -s ours am:
b058dc139d am:
d20b04a41d -s ours am:
4b0164b27c am:
00af0a6d2c am:
b4c5c522e3
am:
4d1c25ec43 -s ours
Change-Id: I3a65198bb51f19e7b655d1da0a081fafbae066fd
Jeff Sharkey [Fri, 3 Feb 2017 00:59:15 +0000 (00:59 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am:
e6be8d765f am:
8f4f4daf2c am:
7c0ea478a8 am:
2848738526 -s ours am:
f19cea14cf am:
ee958351b7
am:
e6060558b3
Change-Id: I3c1874a0178425fe0d23659af68d924ade910c65
Jeff Sharkey [Fri, 3 Feb 2017 00:58:38 +0000 (00:58 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
2dfdf662d0 -s ours am:
4a4b6bfafb am:
61e9179646 -s ours am:
9346bec730 am:
c0cc8695a5 am:
f51e8e8642
am:
bf16fab4e7 -s ours
Change-Id: Ie048d01183ce63035cfa63ab54414b40f0b2b2c7
Jeff Sharkey [Fri, 3 Feb 2017 00:57:39 +0000 (00:57 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am:
6d3573e530 am:
5d65931af5 -s ours am:
f82c373074 am:
8c9ff68173 am:
4b3c59005b
am:
394357761e -s ours
Change-Id: I8330da471c2770612f2898339f567b05853a2479
Jeff Sharkey [Fri, 3 Feb 2017 00:56:34 +0000 (00:56 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
6f13f73b73 am:
73f95823f8 -s ours am:
05749525a5 am:
bd2bec9164 am:
1ddaf2f96b
am:
56131cf7c0 -s ours
Change-Id: I2ca1c4bc0585eee8759d74c5e2a0b90afcd987dc
Jeff Sharkey [Fri, 3 Feb 2017 00:53:49 +0000 (00:53 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am:
3e4faac39f -s ours am:
b058dc139d am:
d20b04a41d -s ours am:
4b0164b27c am:
00af0a6d2c
am:
b4c5c522e3
Change-Id: Iae12207ee70e0212fce0f04a34891b7e20f7aeb0
Jeff Sharkey [Fri, 3 Feb 2017 00:53:05 +0000 (00:53 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am:
e6be8d765f am:
8f4f4daf2c am:
7c0ea478a8 am:
2848738526 -s ours am:
f19cea14cf
am:
ee958351b7
Change-Id: I0413429b94182ce3c7500c3332f110137dceeda7
Jeff Sharkey [Fri, 3 Feb 2017 00:52:36 +0000 (00:52 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
bac46f5b65 am:
3da69c1115 am:
b5740f8c53 am:
4942836d3c -s ours am:
1a9c03f320 am:
928574895b
am:
fd855eeb29
Change-Id: I7c7a9ef89e04e5420655d4ecba55c37cfacaf84b
Jeff Sharkey [Fri, 3 Feb 2017 00:51:19 +0000 (00:51 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am:
7115ad7119 am:
fa22018223 am:
8469d52d41 -s ours am:
f68199a472 am:
a7388f1ed4
am:
7a6bd686a3
Change-Id: I30d3bad3c7c6e6779d5c2b964ae4aa5b68b82bbd
Jeff Sharkey [Fri, 3 Feb 2017 00:50:28 +0000 (00:50 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
2dfdf662d0 -s ours am:
4a4b6bfafb am:
61e9179646 -s ours am:
9346bec730 am:
c0cc8695a5
am:
f51e8e8642
Change-Id: I94a2e244e7ab2d9571632f2d79fcce0ed38e3320
Jeff Sharkey [Fri, 3 Feb 2017 00:49:28 +0000 (00:49 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am:
6d3573e530 am:
5d65931af5 -s ours am:
f82c373074 am:
8c9ff68173
am:
4b3c59005b
Change-Id: Ibc4221c090b1dab98c085486733c987d96c99210
Jeff Sharkey [Fri, 3 Feb 2017 00:48:41 +0000 (00:48 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
6f13f73b73 am:
73f95823f8 -s ours am:
05749525a5 am:
bd2bec9164
am:
1ddaf2f96b
Change-Id: I06a6d16b17cd5611247a442c2e7fa7b7b21134cf
Jeff Sharkey [Fri, 3 Feb 2017 00:47:35 +0000 (00:47 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
bac46f5b65 am:
3da69c1115 am:
b5740f8c53 am:
4942836d3c -s ours am:
1a9c03f320
am:
928574895b
Change-Id: I308132391fced2c9de04e8bcfe9784edc5cacb55
Jeff Sharkey [Fri, 3 Feb 2017 00:46:45 +0000 (00:46 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am:
7115ad7119 am:
fa22018223 am:
8469d52d41 -s ours am:
f68199a472
am:
a7388f1ed4
Change-Id: I92e758c2f2a5d978b9fcd4779e486711f7b1ebe3
Jeff Sharkey [Fri, 3 Feb 2017 00:45:48 +0000 (00:45 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
b18bd06e94 am:
9434773306 am:
bdb0c8fc17 -s ours am:
09d230d473 am:
86a0c4d4d7
am:
d30514edc6
Change-Id: Id0d93a1acb0d2a6d33643a8074b575beac97cee4
Jeff Sharkey [Fri, 3 Feb 2017 00:45:39 +0000 (00:45 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am:
e6be8d765f am:
8f4f4daf2c am:
7c0ea478a8 am:
2848738526 -s ours
am:
f19cea14cf
Change-Id: I80e9b340be8824005055d2fc9ab9effa49a3e5d2
Jeff Sharkey [Fri, 3 Feb 2017 00:43:16 +0000 (00:43 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am:
3e4faac39f -s ours am:
b058dc139d am:
d20b04a41d -s ours am:
4b0164b27c
am:
00af0a6d2c
Change-Id: I367da25f89c5c982f6eacaa1929dbbcbf15801f0
Jeff Sharkey [Fri, 3 Feb 2017 00:42:27 +0000 (00:42 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
bac46f5b65 am:
3da69c1115 am:
b5740f8c53 am:
4942836d3c -s ours
am:
1a9c03f320
Change-Id: I22e7edcb7c6f287da63dfd636ffc777453d2b957
Jeff Sharkey [Fri, 3 Feb 2017 00:42:23 +0000 (00:42 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
2dfdf662d0 -s ours am:
4a4b6bfafb am:
61e9179646 -s ours am:
9346bec730
am:
c0cc8695a5
Change-Id: Ia0e1987122659a913145fc86a6626e0dd1890f24
Jeff Sharkey [Fri, 3 Feb 2017 00:41:20 +0000 (00:41 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
b18bd06e94 am:
9434773306 am:
bdb0c8fc17 -s ours am:
09d230d473
am:
86a0c4d4d7
Change-Id: Ia7727ded9f86932d3f31469e40e63bee0a035c59
Jeff Sharkey [Fri, 3 Feb 2017 00:41:16 +0000 (00:41 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am:
7115ad7119 am:
fa22018223 am:
8469d52d41 -s ours
am:
f68199a472
Change-Id: Icea5f48ca2c969328210a000ffe88dc94e70a0c8
Jeff Sharkey [Fri, 3 Feb 2017 00:41:09 +0000 (00:41 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am:
1f007d1471 -s ours am:
0e09e8c201 am:
33cd012e56
am:
06b98e6b3c
Change-Id: I7b9172df8b14f15e0bf6baba2ede19230ac14d30
Jeff Sharkey [Fri, 3 Feb 2017 00:40:52 +0000 (00:40 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am:
6d3573e530 am:
5d65931af5 -s ours am:
f82c373074
am:
8c9ff68173
Change-Id: Iaa739f638e66376a2aa145a465255f738f9b3f1b
Jeff Sharkey [Fri, 3 Feb 2017 00:40:05 +0000 (00:40 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
021747a076 -s ours am:
4d90982846 am:
9f70b6d4c5
am:
1007b773b9
Change-Id: I654882046c5024d2cbe939bd2727f15550ba4cef
Jeff Sharkey [Fri, 3 Feb 2017 00:40:04 +0000 (00:40 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
6f13f73b73 am:
73f95823f8 -s ours am:
05749525a5
am:
bd2bec9164
Change-Id: I9d9889577061ada5de8c0213ec73d257469466e8
Jeff Sharkey [Fri, 3 Feb 2017 00:37:48 +0000 (00:37 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
b18bd06e94 am:
9434773306 am:
bdb0c8fc17 -s ours
am:
09d230d473
Change-Id: I058f4db80418f939c2f1e3e6f2b61c40b2a3fd91
Jeff Sharkey [Fri, 3 Feb 2017 00:35:19 +0000 (00:35 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am:
3e4faac39f -s ours am:
b058dc139d am:
d20b04a41d -s ours
am:
4b0164b27c
Change-Id: I4dda89507d1003f82af6e204c9983732b36927da
Jeff Sharkey [Fri, 3 Feb 2017 00:34:57 +0000 (00:34 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am:
e6be8d765f am:
8f4f4daf2c am:
7c0ea478a8
am:
2848738526 -s ours
Change-Id: I7c56e83a5de15ec7d3432e3ca4ec385499069f40
Jeff Sharkey [Fri, 3 Feb 2017 00:34:33 +0000 (00:34 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
2dfdf662d0 -s ours am:
4a4b6bfafb am:
61e9179646 -s ours
am:
9346bec730
Change-Id: I456a98abbdcb7d6f7d959a791da726f56f55edf8
Jeff Sharkey [Fri, 3 Feb 2017 00:34:07 +0000 (00:34 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am:
0354b89d31 am:
5536402f6d
am:
6db504c6f6
Change-Id: I4d1e712d09daae9621c5acf336b9ead190920e98
Jeff Sharkey [Fri, 3 Feb 2017 00:34:04 +0000 (00:34 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
bac46f5b65 am:
3da69c1115 am:
b5740f8c53
am:
4942836d3c -s ours
Change-Id: I72d83bb758c1b70a46eb244d93b932ea2dcf1cb4
Jeff Sharkey [Fri, 3 Feb 2017 00:34:00 +0000 (00:34 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am:
1f007d1471 -s ours am:
0e09e8c201
am:
33cd012e56
Change-Id: I8444b378a3554ded73e914e332c55e4e0ce36098
Jeff Sharkey [Fri, 3 Feb 2017 00:33:40 +0000 (00:33 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am:
6d3573e530 am:
5d65931af5 -s ours
am:
f82c373074
Change-Id: I603a9a75c3874f1b7cf099aa26b865fdbe7b0e99
Jeff Sharkey [Fri, 3 Feb 2017 00:33:14 +0000 (00:33 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
3e2652a55d am:
d819c2386b
am:
e79d2be2fe
Change-Id: I1d9b46d67928221e3d06a5f17031e8ca63067280
Jeff Sharkey [Fri, 3 Feb 2017 00:32:57 +0000 (00:32 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am:
7115ad7119 am:
fa22018223
am:
8469d52d41 -s ours
Change-Id: Ib3b38a9c4dacf09aeec385e46b464598c0214a76
Jeff Sharkey [Fri, 3 Feb 2017 00:32:50 +0000 (00:32 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
021747a076 -s ours am:
4d90982846
am:
9f70b6d4c5
Change-Id: I7b5776f73bc99210f018e8e9530f91b032a57d40
Jeff Sharkey [Fri, 3 Feb 2017 00:32:49 +0000 (00:32 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
6f13f73b73 am:
73f95823f8 -s ours
am:
05749525a5
Change-Id: Id298d130a52b44ad9252f8a65c88bb63fbb86f7f
Jeff Sharkey [Fri, 3 Feb 2017 00:31:56 +0000 (00:31 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
b18bd06e94 am:
9434773306
am:
bdb0c8fc17 -s ours
Change-Id: I2d00e5bd394e93e8b2ac218056f30225580f681b
Jeff Sharkey [Fri, 3 Feb 2017 00:30:04 +0000 (00:30 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am:
3e4faac39f -s ours am:
b058dc139d
am:
d20b04a41d -s ours
Change-Id: I2a98850d4c3246c02d5197adff9503be2839df01
Jeff Sharkey [Fri, 3 Feb 2017 00:29:34 +0000 (00:29 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am:
e6be8d765f am:
8f4f4daf2c
am:
7c0ea478a8
Change-Id: I5b1974499b3dba96134a14ab5b00a8942a02fe6f
Jeff Sharkey [Fri, 3 Feb 2017 00:29:13 +0000 (00:29 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
2dfdf662d0 -s ours am:
4a4b6bfafb
am:
61e9179646 -s ours
Change-Id: Ibfdb4128b1db25db478f9b4cb987d0754ddd9124
Jeff Sharkey [Fri, 3 Feb 2017 00:28:43 +0000 (00:28 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
bac46f5b65 am:
3da69c1115
am:
b5740f8c53
Change-Id: Ieca522b743bf9d1840b657b19a5a4f4ffe80a8fd
Jeff Sharkey [Fri, 3 Feb 2017 00:23:24 +0000 (00:23 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am:
6d3573e530
am:
5d65931af5 -s ours
Change-Id: I14933edb3f93eea4156698bb2669938849c30697
Jeff Sharkey [Fri, 3 Feb 2017 00:22:32 +0000 (00:22 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am:
0354b89d31
am:
5536402f6d
Change-Id: I90da8f03fecb6307cfae5bd4a8fec48a6136d29f
Jeff Sharkey [Fri, 3 Feb 2017 00:22:28 +0000 (00:22 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
6f13f73b73
am:
73f95823f8 -s ours
Change-Id: I1361483ca420b86bf1adedfe297d4dcdf5121a18
Jeff Sharkey [Fri, 3 Feb 2017 00:22:20 +0000 (00:22 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am:
1f007d1471 -s ours
am:
0e09e8c201
Change-Id: I07157359ef396832b3c20b745dc09c32b3e85db6
Jeff Sharkey [Fri, 3 Feb 2017 00:22:16 +0000 (00:22 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am:
7115ad7119
am:
fa22018223
Change-Id: Ifb220fbac07f4dcbb455080107ebc765611cf022
Jeff Sharkey [Fri, 3 Feb 2017 00:22:15 +0000 (00:22 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am:
3e4faac39f -s ours
am:
b058dc139d
Change-Id: Idd1aeb4749741aa8bae76cf43ce3f2bdceff077d
Jeff Sharkey [Fri, 3 Feb 2017 00:21:58 +0000 (00:21 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am:
e6be8d765f
am:
8f4f4daf2c
Change-Id: I049f66856f9354432f722fd29248720d76e6c5e1
Jeff Sharkey [Fri, 3 Feb 2017 00:21:19 +0000 (00:21 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
3e2652a55d
am:
d819c2386b
Change-Id: I6f5d0680a0cd60a02060851bcdbb0d1fa2494688
Jeff Sharkey [Fri, 3 Feb 2017 00:21:18 +0000 (00:21 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
021747a076 -s ours
am:
4d90982846
Change-Id: I1defb93e1af42c503f94c0af2ad8dbdb361be6ab
Jeff Sharkey [Fri, 3 Feb 2017 00:21:15 +0000 (00:21 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
b18bd06e94
am:
9434773306
Change-Id: I1dae5df31fbd29f96a3f8adf898fd6c7c716f56e
Jeff Sharkey [Fri, 3 Feb 2017 00:21:13 +0000 (00:21 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
2dfdf662d0 -s ours
am:
4a4b6bfafb
Change-Id: Id479b2d27fd8396047312fe7259971c167b8d705
Jeff Sharkey [Fri, 3 Feb 2017 00:21:10 +0000 (00:21 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
bac46f5b65
am:
3da69c1115
Change-Id: I19ff97bb24c7cf985c8877b0c365f6eb4624fe80
Jeff Sharkey [Fri, 3 Feb 2017 00:12:45 +0000 (00:12 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev
am:
e6be8d765f
Change-Id: I502a04687a3a7840860e1a3af0a702f7162a8897
Jeff Sharkey [Fri, 3 Feb 2017 00:12:43 +0000 (00:12 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
bac46f5b65
Change-Id: I87dbe96e14c68b5d99b43bf7ad3d653d5fb33a61
Jeff Sharkey [Fri, 3 Feb 2017 00:12:31 +0000 (00:12 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev
am:
1f007d1471 -s ours
Change-Id: I5fb0f4d1ebf169c8e1309c1d7549d34b362c8328
Jeff Sharkey [Fri, 3 Feb 2017 00:12:26 +0000 (00:12 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
021747a076 -s ours
Change-Id: Id5d516b36b7cafc364d49109813d12f73ddb4684
Jeff Sharkey [Fri, 3 Feb 2017 00:12:19 +0000 (00:12 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev
am:
0354b89d31
Change-Id: I186f3fc1530e8a554916f83bf8e9fb98adceb507
Jeff Sharkey [Fri, 3 Feb 2017 00:12:15 +0000 (00:12 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
3e2652a55d
Change-Id: I19c72afa1d6407786b4a02d232f8489c42ea700d
Jeff Sharkey [Fri, 3 Feb 2017 00:12:11 +0000 (00:12 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev
am:
7115ad7119
Change-Id: Ib9e5a56a4bac34dbf9ef3fc4122d4a2ac1e0bb7e
Jeff Sharkey [Fri, 3 Feb 2017 00:12:10 +0000 (00:12 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev
am:
6d3573e530
Change-Id: I501ff6230b9b5fa5d7232e52cfe326320c7edf65
Jeff Sharkey [Fri, 3 Feb 2017 00:12:08 +0000 (00:12 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
6f13f73b73
Change-Id: I28627832c3ec765d6761afbf3fc508d1069c9582
Jeff Sharkey [Fri, 3 Feb 2017 00:12:08 +0000 (00:12 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
b18bd06e94
Change-Id: Ia946b314e7c12c5a04f6c117a9b2e2537fc006e9
Jeff Sharkey [Fri, 3 Feb 2017 00:10:17 +0000 (00:10 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev
am:
3e4faac39f -s ours
Change-Id: If1ea6da6679874ca13379222a28c529421c80b23
Jeff Sharkey [Fri, 3 Feb 2017 00:10:16 +0000 (00:10 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
2dfdf662d0 -s ours
Change-Id: Id06fac9dd096c1d821a1af7451db388446e9b156
Jeff Sharkey [Fri, 3 Feb 2017 00:10:09 +0000 (00:10 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev
am:
6b8ae05e36
Change-Id: I3390fac08bf7047fce526b2553c1fb2908c4167c
Jeff Sharkey [Fri, 3 Feb 2017 00:10:05 +0000 (00:10 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
b61338ecb3
Change-Id: I56e937265e43bc9dd0adbe24167ae52b5bc0b818
OSDN Git Service
