OSDN Git Service
gitbuildkicker [Tue, 7 Feb 2017 08:09:32 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
TreeHugger Robot [Tue, 7 Feb 2017 04:30:04 +0000 (04:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 7 Feb 2017 04:21:41 +0000 (04:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Charles He [Tue, 7 Feb 2017 01:15:20 +0000 (01:15 +0000)]
Merge "Fingerprint: get auth id for non-current user." into nyc-mr2-dev
Charles He [Fri, 27 Jan 2017 16:14:52 +0000 (16:14 +0000)]
Fingerprint: get auth id for non-current user.
Previously, getAuthenticatorId() simply returns the authenticator id
corresponding to the currently active user in FingerprintService.
However, this can cause bugs when, for example, KeyStore calls the
method before storing a fingerprint-bound key for a non-current user. In
such cases, the authenticator id of the calling user is desired, which
is not necessarily the same as the "current user" in FingerprintService.
This CL ensures the FingerprintService always returns the authenticator
id of the calling user.
Bug:
33459191
Test: manual
Change-Id: Ia9d6b869d16bd37f45358ba839cd12901ebc1076
Merged-In: I35c5a3a7082cffb8941eeaa219c8e20948ad41a9
Bill Yi [Tue, 7 Feb 2017 00:42:58 +0000 (16:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id83eff0bcff1cfadadc4e91ce2d9d58a3f31194e
Auto-generated-cl: translation import
TreeHugger Robot [Mon, 6 Feb 2017 23:21:01 +0000 (23:21 +0000)]
Merge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev
Aaron Whyte [Mon, 6 Feb 2017 23:00:39 +0000 (23:00 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev
am:
50fa8ad424
Change-Id: Ic5235c90571dc90411570fb16e9003a89e79c183
Ying Wai (Daniel) Fan [Mon, 6 Feb 2017 23:00:35 +0000 (23:00 +0000)]
Prevent division-by-zero error when calculating battery capacity.
am:
415f8b32e8
Change-Id: Ie58c329fa0814111291922b9a669ca181d4a487f
Bill Yi [Mon, 6 Feb 2017 22:55:04 +0000 (14:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: If399bc861f4e82ce0e7e285927ff1cd90b15ced1
Auto-generated-cl: translation import
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
Manu Cornet [Mon, 6 Feb 2017 22:38:31 +0000 (22:38 +0000)]
Merge "2D Recents: use correct layout logic for drawing transition headers" into nyc-mr2-dev
Ricardo Loo [Mon, 6 Feb 2017 20:50:48 +0000 (20:50 +0000)]
Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am:
19dae584ba
am:
b06c3ed79e
Change-Id: I97f1b4559b0c8d4eb3709a455e54157fe3a40426
Ricardo Loo [Mon, 6 Feb 2017 20:49:49 +0000 (20:49 +0000)]
docs: Update gluUnProject parameter description. am:
232c4900ac
am:
cb6a5fc0f3
Change-Id: Ied7be460f12d29dd1ce77be724c11b78e2179293
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:37:03 +0000 (19:37 +0000)]
Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev
am:
16edc46ca3
Change-Id: Idb27cb8e19376e11f7ec2e9366c50c8d382cf8ba
Aga Madurska [Mon, 6 Feb 2017 19:37:00 +0000 (19:37 +0000)]
Use correct APIs to detect conditions for round scrollbars.
am:
99485ef841
Change-Id: I8301a27b03d1ba64e48064057f112ebaf38eb6c2
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:47:10 +0000 (17:47 +0000)]
Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am:
504ca8e41a
am:
1f8f29968b
Change-Id: Ib43072f8a6d35c4e297493f49386aafed53a609a
Pavel Grafov [Mon, 6 Feb 2017 17:46:09 +0000 (17:46 +0000)]
Fix the documentation for SecurityLog.SecurityEvent.getData(). am:
739cda8f31
am:
fca679ff74
Change-Id: I9f02c30450e56b8f25bbbe4b1baa2381c84437c8
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
gitbuildkicker [Sun, 5 Feb 2017 08:09:52 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
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
TreeHugger Robot [Fri, 3 Feb 2017 08:57:20 +0000 (08:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 3 Feb 2017 08:10:51 +0000 (08:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 3 Feb 2017 08:10:32 +0000 (08:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 3 Feb 2017 08:09:59 +0000 (08:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 3 Feb 2017 08:09:38 +0000 (08:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 3 Feb 2017 08:09:02 +0000 (08:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 3 Feb 2017 08:08:31 +0000 (08:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 3 Feb 2017 08:08:06 +0000 (08:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 3 Feb 2017 08:06:40 +0000 (08:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Fri, 3 Feb 2017 07:13:19 +0000 (23:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I048f56389089e4ddda39477a10c935dd5ed00552
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Feb 2017 04:27:50 +0000 (20:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0292d15f9ce58b6ae589e9901155dc233da8994e
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Feb 2017 03:57:19 +0000 (19:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4fd53e32bdd8da20d93cd2800fce5bb007c2f5ad
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Feb 2017 03:53:39 +0000 (19:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I96c4934556779581110e0e625dd69604f33ea624
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Feb 2017 03:50:14 +0000 (19:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib30b732ba934a3d301d1763dca7642f4c5a9e83a
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Feb 2017 03:47:04 +0000 (19:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic396f6c902a55fc4a5d0e2246c5e6be7a6a310eb
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Feb 2017 03:30:38 +0000 (19:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ica7657382bbe34cb849b6bc07b6bc3f92b04049a
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Feb 2017 03:19:09 +0000 (19:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic4421f63eb2837c54e32b25ddc7160ab50faa308
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Feb 2017 03:15:46 +0000 (19:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0ce933b5ea5d86252fad10b0e6aedcd88b57f87f
Auto-generated-cl: translation import
Jeff Sharkey [Fri, 3 Feb 2017 01:30:51 +0000 (01: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 am:
4b0164b27c am:
00af0a6d2c am:
b4c5c522e3 am:
4d1c25ec43 -s ours am:
43f79eec8b am:
cecf30c3a2 am:
5a50d2b12c
am:
34df10ec98
Change-Id: I74e19a0c1a310084ca5785ed8d8bc5988cce2258
Jeff Sharkey [Fri, 3 Feb 2017 01:30:01 +0000 (01:30 +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
am:
6cfa84791d
Change-Id: Idd62b3a72d5f8daf403100c6a6150b5792c00de7
Jeff Sharkey [Fri, 3 Feb 2017 01:28:54 +0000 (01:28 +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
am:
ce15555148
Change-Id: Iae6d62ce80959214aac7299ff1077a54d69e03b5
Jeff Sharkey [Fri, 3 Feb 2017 01:25:30 +0000 (01:25 +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
am:
8c23d1aadb
Change-Id: I78fd2fdabdbaf2d10f930a0ccc46cb9380b4b5ad
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 01:04:21 +0000 (01:04 +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
am:
1eb2ded281
Change-Id: I7b51f2a51a15ca961e345e8540f2f0ff517494d4
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:57:22 +0000 (00:57 +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
am:
e6f2767d54
Change-Id: I658d46b2c675ecedb08c32275d0cfbb6b84c1f77
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:56:19 +0000 (00:56 +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
am:
1e9b978dc7
Change-Id: I665006f7ec40f409489bfdfa586cab9dfd0222e6
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:51:18 +0000 (00:51 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
b18bd06e94 am:
9434773306 am:
bdb0c8fc17 -s ours am:
09d230d473 am:
86a0c4d4d7 am:
d30514edc6
am:
2e3a277175
Change-Id: I24b189c0e0c006a06c4c08e64a1de911fa7cc32c
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:47:05 +0000 (00:47 +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
am:
76ce0386db
Change-Id: I85d3cd8cb4d67258132cb89f1dbdb4dc75bc8d1b
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:46:15 +0000 (00:46 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
021747a076 -s ours am:
4d90982846 am:
9f70b6d4c5 am:
1007b773b9
am:
8501b686f7
Change-Id: Id2cece709462063fd7211dbb04c1f27edf7d64ef
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:39:31 +0000 (00:39 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am:
0354b89d31 am:
5536402f6d am:
6db504c6f6
am:
609145c315
Change-Id: I212139b16c6b00a3a1b61a851bb7f7099ecf2120
Jeff Sharkey [Fri, 3 Feb 2017 00:38:43 +0000 (00:38 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
3e2652a55d am:
d819c2386b am:
e79d2be2fe
am:
e25ab62f5b
Change-Id: Id801fbb628423a239da2db2a058ed7a9dcf1c46a
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