OSDN Git Service
Android Build Merger (Role) [Mon, 6 Feb 2017 17:54:24 +0000 (17:54 +0000)]
Merge "Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am:
504ca8e41a am:
1f8f29968b am:
43c6f28891" into nyc-mr2-dev-plus-aosp
Pavel Grafov [Mon, 6 Feb 2017 17:53:42 +0000 (17:53 +0000)]
Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am:
504ca8e41a am:
1f8f29968b
am:
43c6f28891
Change-Id: I862bf8bfb188bb2951d5c01254239d42ef92e1c2
Android Build Merger (Role) [Mon, 6 Feb 2017 17:53:29 +0000 (17:53 +0000)]
Merge "Fix the documentation for SecurityLog.SecurityEvent.getData(). am:
739cda8f31 am:
fca679ff74 am:
1bb00e0849" into nyc-mr2-dev-plus-aosp
Pavel Grafov [Mon, 6 Feb 2017 17:52:43 +0000 (17:52 +0000)]
Fix the documentation for SecurityLog.SecurityEvent.getData(). am:
739cda8f31 am:
fca679ff74
am:
1bb00e0849
Change-Id: Ice787dfa05849e8a2b77575969334c33509cacb7
Pavel Grafov [Mon, 6 Feb 2017 17:52:37 +0000 (17:52 +0000)]
Fix the documentation for SecurityLog.SecurityEvent.getData(). am:
739cda8f31 am:
fca679ff74
am:
5a474b4930
Change-Id: If1731db386157b1f53c3a7bbe379299c1ada0ca9
Pavel Grafov [Mon, 6 Feb 2017 17:47:17 +0000 (17:47 +0000)]
Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am:
504ca8e41a
am:
1f8f29968b
Change-Id: Id0a5c05b902f6c47c32dbef4d84cbe527a8803b9
Pavel Grafov [Mon, 6 Feb 2017 17:46:11 +0000 (17:46 +0000)]
Fix the documentation for SecurityLog.SecurityEvent.getData(). am:
739cda8f31
am:
fca679ff74
Change-Id: Ic6e2aab590583c501fa74317ee614ab1ebaea378
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
Jason Monk [Mon, 6 Feb 2017 15:52:04 +0000 (15:52 +0000)]
Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" am:
ff1d8da55e am:
74a8b6543f
am:
a8e10e5f20
Change-Id: I1585be50ecf4409f552b5ef5c91de1092a01e199
Jason Monk [Mon, 6 Feb 2017 15:47:39 +0000 (15:47 +0000)]
Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" am:
ff1d8da55e
am:
74a8b6543f
Change-Id: If195ccf536a45ef21e8ee70547ea76e26732c583
Jason Monk [Mon, 6 Feb 2017 15:43:04 +0000 (15:43 +0000)]
Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent"
am:
ff1d8da55e
Change-Id: I173b94730ae02f3e9b0638aac9f43972b59e10f3
Jason Monk [Mon, 6 Feb 2017 15:34:37 +0000 (15:34 +0000)]
Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent"
Narayan Kamath [Mon, 6 Feb 2017 14:25:35 +0000 (14:25 +0000)]
Merge "MethodHandles: Expose additional API." am:
869141fef7 am:
a93d04a765
am:
f29140955f
Change-Id: I3e909e1a4faf70fcc9a58fc7bcd6c25abc87d901
Narayan Kamath [Mon, 6 Feb 2017 14:21:07 +0000 (14:21 +0000)]
Merge "MethodHandles: Expose additional API." am:
869141fef7
am:
a93d04a765
Change-Id: I7eef5b76fadc6303ae37b95fb855b16d2411bdb9
Narayan Kamath [Mon, 6 Feb 2017 14:15:48 +0000 (14:15 +0000)]
Merge "MethodHandles: Expose additional API."
am:
869141fef7
Change-Id: I73b9867bc1973dd4661470cebb0d9086666593aa
Narayan Kamath [Mon, 6 Feb 2017 14:09:45 +0000 (14:09 +0000)]
Merge "MethodHandles: Expose additional API."
Orion Hodson [Mon, 6 Feb 2017 10:43:22 +0000 (10:43 +0000)]
Merge "Add bytecodes for invoke-polymorphic" am:
ef59955f58 am:
dcaa9fd642
am:
4fc15223c2
Change-Id: I022d1917400ea9e694cc58743ca345ac58fe0379
Orion Hodson [Mon, 6 Feb 2017 10:37:24 +0000 (10:37 +0000)]
Merge "Add bytecodes for invoke-polymorphic" am:
ef59955f58
am:
dcaa9fd642
Change-Id: I4dba3f073900fa47cb1c4fa8ec36fb8f547fd982
Orion Hodson [Mon, 6 Feb 2017 10:30:40 +0000 (10:30 +0000)]
Merge "Add bytecodes for invoke-polymorphic"
am:
ef59955f58
Change-Id: If95860a3680dc8857b54a864917d5074eba57c9a
Orion Hodson [Mon, 6 Feb 2017 10:21:53 +0000 (10:21 +0000)]
Merge "Add bytecodes for invoke-polymorphic"
Akira Oshimi [Tue, 24 Jan 2017 07:50:53 +0000 (16:50 +0900)]
Add tile information to ACTION_QS_TILE_PREFERENCES intent
One application can provide two or more custom Quick Settings tiles.
But there is no way to know which tile is long-pressed from application
side because ACTION_QS_TILE_PREFERENCES intent that is sent when
long-pressed doesn't have any additional information. So the component
name and state of the tile should be added to the intent.
Bug:
34832801
Test: manual - long press a custom tile
Change-Id: Iaa884cd944f19a2f007cbde645e8f8b1198bffb7
Chris Craik [Fri, 3 Feb 2017 22:03:53 +0000 (22:03 +0000)]
Merge "Add ShadowShaderAnimation benchmark DO NOT MERGE" am:
6678d34133 -s ours am:
6385d23f43 -s ours
am:
7a0720e22c
Change-Id: Idc55c41fdbad5ef6a81d753d2acad34b81137586
Paul Lawrence [Fri, 3 Feb 2017 21:58:03 +0000 (21:58 +0000)]
Merge "Expand whitelist" am:
fe88a5e81d am:
f907b0fcc7
am:
edc3f365a0
Change-Id: I51bc6c7b90c2e93942c62c0eb49c13b19581a0d9
Chris Craik [Fri, 3 Feb 2017 21:57:58 +0000 (21:57 +0000)]
Merge "Add ShadowShaderAnimation benchmark DO NOT MERGE" am:
6678d34133 -s ours
am:
6385d23f43 -s ours
Change-Id: Ifbd64ab5edd16d84aa252408b1ceafc0a713321c
Chris Craik [Fri, 3 Feb 2017 21:53:26 +0000 (21:53 +0000)]
Merge "Add ShadowShaderAnimation benchmark DO NOT MERGE"
am:
6678d34133 -s ours
Change-Id: I841f908f57d94ee91c72ef2c6d428cc1f14a5690
Chris Craik [Fri, 3 Feb 2017 21:44:34 +0000 (21:44 +0000)]
Merge "Add ShadowShaderAnimation benchmark DO NOT MERGE"
Tyler Gunn [Fri, 3 Feb 2017 21:40:45 +0000 (13:40 -0800)]
resolve merge conflicts of
d04c51ea372a to nyc-mr2-dev-plus-aosp
Test: Fix build.
Change-Id: I5808fc02502ced2195728ad146ef5523a8eb19ae
Paul Lawrence [Fri, 3 Feb 2017 21:28:30 +0000 (21:28 +0000)]
Merge "Expand whitelist" am:
fe88a5e81d
am:
f907b0fcc7
Change-Id: Ifb2506e0f8cf697d1bbd4eb0ea744ed8fc9d2b63
Paul Lawrence [Fri, 3 Feb 2017 21:23:55 +0000 (21:23 +0000)]
Merge "Expand whitelist"
am:
fe88a5e81d
Change-Id: I9bc80af8b045edb667840828fc84f2e0ab12863b
Paul Lawrence [Fri, 3 Feb 2017 21:16:59 +0000 (21:16 +0000)]
Merge "Expand whitelist"
Tyler Gunn [Fri, 3 Feb 2017 21:15:36 +0000 (21:15 +0000)]
Merge "Add "wifi lost" disconnect cause." am:
802b0c8fd1
am:
4e26b8e75e
Change-Id: I783d8693258d31341d946fa1f20e4c744ee410b3
Tyler Gunn [Fri, 3 Feb 2017 21:10:39 +0000 (21:10 +0000)]
Merge "Add "wifi lost" disconnect cause."
am:
802b0c8fd1
Change-Id: I2f1ac8f8d8874f30720790888fa4e6beabc03c91
Tyler Gunn [Fri, 3 Feb 2017 21:03:22 +0000 (21:03 +0000)]
Merge "Add "wifi lost" disconnect cause."
Paul Lawrence [Fri, 3 Feb 2017 20:27:30 +0000 (20:27 +0000)]
Merge "Optimize seccomp" am:
7e812616c9 am:
9375f3eff6
am:
38b7d83f8e
Change-Id: Ia48dba402b42dcd449507ea34a438e2a14d4164f
Paul Lawrence [Fri, 3 Feb 2017 20:22:49 +0000 (20:22 +0000)]
Merge "Optimize seccomp" am:
7e812616c9
am:
9375f3eff6
Change-Id: I8cc56a3e5512764a02004f27f976e72da554ef38
Paul Lawrence [Fri, 3 Feb 2017 20:19:11 +0000 (20:19 +0000)]
Merge "Optimize seccomp"
am:
7e812616c9
Change-Id: I6061c25fe18b136d9a4920acd3f54043c44abe4a
Paul Lawrence [Fri, 3 Feb 2017 20:14:14 +0000 (20:14 +0000)]
Merge "Optimize seccomp"
Chris Craik [Thu, 2 Feb 2017 23:41:58 +0000 (15:41 -0800)]
Add ShadowShaderAnimation benchmark DO NOT MERGE
Bug:
34809371
Test: manual
New benchmark uses several levels of overdraw from just shadows to benchmark
shadow shader performance.
Tessellation workload is minimal, due to simple rect caster shape.
Change-Id: I572476bd54e04566851f39027ada7254597b37f8
Tyler Gunn [Mon, 30 Jan 2017 17:52:55 +0000 (09:52 -0800)]
Add "wifi lost" disconnect cause.
New disconnect cause used when wifi call is dropped due to loss of wifi
connection.
Test: Manual, unit.
Merged-In: Iedaa9f54ff6dbfe90a6ce01fc9eb0aad126d05f0
Bug:
32571209
Change-Id: Iedaa9f54ff6dbfe90a6ce01fc9eb0aad126d05f0
Paul Lawrence [Fri, 3 Feb 2017 18:10:32 +0000 (10:10 -0800)]
Expand whitelist
Bug:
34908783
Test: Device boots. Unable to test app due to Fake OEM error
Change-Id: I2a0f5646fa39f95875ecb661599d76f4b28a43ac
Bill Yi [Fri, 3 Feb 2017 09:02:47 +0000 (09:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
7acceb8746 -s ours
Change-Id: I9035c31bada7ae86c4670b8f4c0d17ed4ec61a3e
Bill Yi [Fri, 3 Feb 2017 09:02:42 +0000 (09:02 +0000)]
Import translations. DO NOT MERGE
am:
49a9d35eb7 -s ours
Change-Id: I2c4aa7f43a77a81b529fe0b05b1e51b46ff3e3c9
TreeHugger Robot [Fri, 3 Feb 2017 08:57:20 +0000 (08:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Fri, 3 Feb 2017 08:32:40 +0000 (08:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
d46d030238 -s ours
Change-Id: Ia8667cafa6bd5444781956939376f4689526f2ff
Bill Yi [Fri, 3 Feb 2017 08:32:36 +0000 (08:32 +0000)]
Import translations. DO NOT MERGE
am:
37093ca19c -s ours
Change-Id: I3788ed72857526a3447937309ea42c0f487d0801
Bill Yi [Fri, 3 Feb 2017 08:31:12 +0000 (08:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
b2d152ee90 -s ours
Change-Id: I2d3533869005160f27b38005a43b6cf85e1938d4
Bill Yi [Fri, 3 Feb 2017 08:31:09 +0000 (08:31 +0000)]
Import translations. DO NOT MERGE
am:
31423f28b7 -s ours
Change-Id: I982cfdc9ddd15d1640f465f6c39214a0a106f210
Bill Yi [Fri, 3 Feb 2017 08:22:49 +0000 (08:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
362113588f -s ours
Change-Id: I76c205aea0f8314361bcbe02d9b52a6af686b16b
Bill Yi [Fri, 3 Feb 2017 08:22:44 +0000 (08:22 +0000)]
Import translations. DO NOT MERGE
am:
b2d808b3f3 -s ours
Change-Id: Ifd3e9cce1f8a4f2d0df5e7ee160846acfca6708c
Bill Yi [Fri, 3 Feb 2017 08:21:19 +0000 (08:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
e2d9a7fef5 -s ours
Change-Id: I986c9389991effc7fe151d7e915395366287a0e4
Bill Yi [Fri, 3 Feb 2017 08:21:15 +0000 (08:21 +0000)]
Import translations. DO NOT MERGE
am:
f812207041 -s ours
Change-Id: I91f584326d31021500cf39c654e97af575e3a643
Bill Yi [Fri, 3 Feb 2017 08:19:54 +0000 (08:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
a9d4a2cdc5 -s ours
Change-Id: Ia9191ca4704c04bfd5c3e4bb5aedd698149ea549
Bill Yi [Fri, 3 Feb 2017 08:19:48 +0000 (08:19 +0000)]
Import translations. DO NOT MERGE
am:
ba8e772bbe -s ours
Change-Id: I327c46a19ed0b538d0958a401c2fdeebe1ca43d9
Bill Yi [Fri, 3 Feb 2017 08:18:19 +0000 (08:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
18891008dc -s ours
Change-Id: I5dd67e4f5ccabd9b0541cd7e018bef672ce0be99
Bill Yi [Fri, 3 Feb 2017 08:18:15 +0000 (08:18 +0000)]
Import translations. DO NOT MERGE
am:
8c97416258 -s ours
Change-Id: I64e26c17c26b7379168aaa16247b072a48c1029e
Bill Yi [Fri, 3 Feb 2017 08:16:43 +0000 (08:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
ec47322af8 -s ours
Change-Id: Id7a79cc463019f707f0c1fc5ff686edef6acb1fc
Bill Yi [Fri, 3 Feb 2017 08:16:37 +0000 (08:16 +0000)]
Import translations. DO NOT MERGE
am:
62c95279e2 -s ours
Change-Id: I25c1dab543c4ceeb89235351c64f5582f9c45e44
Bill Yi [Fri, 3 Feb 2017 08:15:11 +0000 (08:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
c3d842df73 -s ours
Change-Id: I8d1b3272011f76fe78c590ace5913e7131b9efce
Bill Yi [Fri, 3 Feb 2017 08:15:05 +0000 (08:15 +0000)]
Import translations. DO NOT MERGE
am:
9b11a3cea8 -s ours
Change-Id: I4682fbbdc6491a54ff75cdf15a6710a067d9ce2e
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:50:10 +0000 (01:50 +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
am:
a5aab481fd
Change-Id: I9e6b2a1e9a5ba67239360abe3e9ef1378a242aa4
Jeff Sharkey [Fri, 3 Feb 2017 01:49:06 +0000 (01:49 +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
am:
ed3b36666b
Change-Id: I6e43d46f42abf4a93d10c145a2de94db4110e7f8
Jeff Sharkey [Fri, 3 Feb 2017 01:48:07 +0000 (01:48 +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
am:
e8895e868e
Change-Id: I9e9e577da682a8e8866c5de52123432bc78541f4
Jeff Sharkey [Fri, 3 Feb 2017 01:46:59 +0000 (01:46 +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
am:
de02369ab9
Change-Id: I573eaa0ef9d6aae3b634ace82676cd1ce1aa9996
Jeff Sharkey [Fri, 3 Feb 2017 01:46:04 +0000 (01:46 +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
am:
d4adaada55
Change-Id: Iaed6747905a26eb292a054dcf00f4fd22f4805fe
Jeff Sharkey [Fri, 3 Feb 2017 01:45:12 +0000 (01:45 +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
am:
1d5d7d1a5f
Change-Id: I1d8014cba58dbcccacf0a9e4889c0a83688d3d85
Jeff Sharkey [Fri, 3 Feb 2017 01:44:16 +0000 (01:44 +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
am:
d96c17f7df
Change-Id: I9cf473c9a4e756e5265064cb534fd34c4dfc595a
Jeff Sharkey [Fri, 3 Feb 2017 01:43:25 +0000 (01:43 +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
am:
7b2985bc9e
Change-Id: Ic45fa1e8dad2891d2440329050c2e9d590e97e32
Jeff Sharkey [Fri, 3 Feb 2017 01:42:21 +0000 (01:42 +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
am:
626d56f2bf
Change-Id: Ie4d1de5eec8d3b54ba9067f7cabd3d87814e084d
Android Build Merger (Role) [Fri, 3 Feb 2017 01:38:38 +0000 (01:38 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system. am:
021747a076 -s ours am:
4d90982846 am:
9f70b6d4c5 am:
1007b773b9 am:
8501b686f7 am:
030e74a380" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 3 Feb 2017 01:38:07 +0000 (01:38 +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: I3ec708579e86a3008dc0b660dee7b792fef0a11f
Android Build Merger (Role) [Fri, 3 Feb 2017 01:38:00 +0000 (01:38 +0000)]
Merge "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 am:
0387fd89f2" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 3 Feb 2017 01:37:59 +0000 (01:37 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
021747a076 -s ours am:
4d90982846 am:
9f70b6d4c5 am:
1007b773b9 am:
8501b686f7
am:
030e74a380
Change-Id: I50b94061271fc8ea4ea87182a2c2628c8b5e82be
Android Build Merger (Role) [Fri, 3 Feb 2017 01:37:34 +0000 (01:37 +0000)]
Merge "Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am:
0354b89d31 am:
5536402f6d am:
6db504c6f6 am:
609145c315 am:
af86efd70d" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 3 Feb 2017 01:37:25 +0000 (01:37 +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
am:
0387fd89f2
Change-Id: Ibeb32d154565051af7e7268e7ef2485ad785c336
Android Build Merger (Role) [Fri, 3 Feb 2017 01:37:00 +0000 (01:37 +0000)]
Merge "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 am:
87ae27b020" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 3 Feb 2017 01:37:02 +0000 (01:37 +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: I6e3919c82860452f42b6a09f27c9cecc720c82ef
Jeff Sharkey [Fri, 3 Feb 2017 01:36:53 +0000 (01:36 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am:
0354b89d31 am:
5536402f6d am:
6db504c6f6 am:
609145c315
am:
af86efd70d
Change-Id: I4c4b40569545c26adc8f3f4b8c82ac6525f89b22
Android Build Merger (Role) [Fri, 3 Feb 2017 01:36:30 +0000 (01:36 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system. am:
3e2652a55d am:
d819c2386b am:
e79d2be2fe am:
e25ab62f5b am:
cc17b28c0c" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 3 Feb 2017 01:36:30 +0000 (01:36 +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
am:
87ae27b020
Change-Id: I334462069b1c00c8f302d97996c92a59f952c0b6
Android Build Merger (Role) [Fri, 3 Feb 2017 01:35:55 +0000 (01:35 +0000)]
Merge "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 am:
0792846ea5" into nyc-mr2-dev-plus-aosp
OSDN Git Service
