git.osdn.net Git - android-x86/frameworks-base.git/log

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 3 Feb 2017 08:08:06 +0000 (08:08 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 3 Feb 2017 08:06:40 +0000 (08:06 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:35:56 +0000 (01:35 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe am: e25ab62f5b
am: cc17b28c0c

Change-Id: I3b03f78cfd1169d04502abc48e3647d7eb39f085

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:35:51 +0000 (01:35 +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: I3f313eea586334158e710ca4a6545127e7fa8855

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:35:03 +0000 (01:35 +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: 0792846ea5

Change-Id: I389df4e503e76b311a9b93e3327b423b07e7de26

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:34:48 +0000 (01:34 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e36 am: 806307106b
am: 6529292783

Change-Id: Iebcdf8ff79316c718a461445eba8169c68d00e1b

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:34:46 +0000 (01:34 +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: I92db1043b77799dd3c7a9c6852c258bc0d5aa8ed

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:33:41 +0000 (01:33 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3 am: 30a4388481
am: 825a242ea9

Change-Id: If76c1073c80718296c814b43971b89f642ada7c9

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:32:51 +0000 (01:32 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours am: bcc2e70d40 -s ours am: 6b398f72cb -s ours am: cda0f97790 -s ours
am: e12285ac47 -s ours

Change-Id: I241cf4fcfae223ab115aff90ba70ac84a2e773d4

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:32:11 +0000 (01:32 +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: I7ceae022988bc333631cd83eed868ae573096bb4

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:31:40 +0000 (01:31 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours am: 6b1fd0f9cf -s ours am: 56be9656f7 -s ours am: e3d5ea3a18 -s ours am: 58d9af0c77 -s ours
am: b696cba781 -s ours

Change-Id: Ifedcf384ac1fd3960045ab1481c2aaedb7c39264

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:31:09 +0000 (01:31 +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: I4598997f5c121f81170fc29d52151e727e143ead

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:30:04 +0000 (01:30 +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: I23fe0c7c446c3c2ed0570606a4ac9860df866295

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 3 Feb 2017 01:29:30 +0000 (01:29 +0000)]

Merge "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: b93bc585f0" into nyc-mr2-dev-plus-aosp

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:28:59 +0000 (01:28 +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: b93bc585f0

Change-Id: Ic6f3436322ba32797858d454d53b8210b46e0f29

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:28:43 +0000 (01:28 +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: Ifc5567bfeb3736c96d3637bfb98b61609b0dbfda

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:27:32 +0000 (01:27 +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: I1a5282c25eba331df935ab2863c33406e8b694fb

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:27:29 +0000 (01:27 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours am: f1e045b733 am: dcc633f1f8 am: 67a4d3e428 am: 710a7e40dc
am: 20d2868f5c

Change-Id: Iaa64dee6de0055daa896ab548756f70eb9dd4ca8

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:26:36 +0000 (01:26 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846 am: 9f70b6d4c5 am: 1007b773b9
am: 8501b686f7

Change-Id: Icd5ceccc8048ca31363a190d66a3f9d0dff84e1c

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:26:20 +0000 (01:26 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0 am: 5a2e7e2e58 am: b2cdb4e2dd
am: cb84f799ff

Change-Id: Ic1bffe4a69db81544bfff9543ae94aed0ee4a0f3

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:25:39 +0000 (01:25 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6
am: 609145c315

Change-Id: I604956b3959cad56e7fa7c39e4fd51fc8c42a5c7

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:25:19 +0000 (01:25 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours am: 5fce769ecf am: 642912652e am: a293067f0b am: 3411150115
am: 7c6d80e66c

Change-Id: Ia28ea9874cabde49ce481000e1bdba3d709eaecb

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:24:53 +0000 (01:24 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe
am: e25ab62f5b

Change-Id: Ibf4de297e76cc0dc849d4f16ff1ae29b9ada950c

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:23:52 +0000 (01:23 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e36
am: 806307106b

Change-Id: I0dca98d50cb5a1f835be0c9cd960d8ed15f16e7a

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:22:53 +0000 (01:22 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3
am: 30a4388481

Change-Id: I8b612304980150f522b0424e564f3bedf030c2b9

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:21:35 +0000 (01:21 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours am: bcc2e70d40 -s ours am: 6b398f72cb -s ours
am: cda0f97790 -s ours

Change-Id: Icb63044e32d8898cdb5624d38fef4de30b818978

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:20:32 +0000 (01:20 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours am: 6b1fd0f9cf -s ours am: 56be9656f7 -s ours am: e3d5ea3a18 -s ours
am: 58d9af0c77 -s ours

Change-Id: I23f74f1c1588800b2dbc4c33ef15ab457951b57d

commit | commitdiff | tree

Jack Yu [Fri, 3 Feb 2017 01:19:39 +0000 (01:19 +0000)]

resolve merge conflicts of e06c03d8437f to nyc-mr1-dev-plus-aosp
am: 5c6041843d

Change-Id: I7f0cd240b6054f57616e223f31d09a4152fe34e9

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:19:09 +0000 (01:19 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours am: f1e045b733 am: dcc633f1f8 am: 67a4d3e428
am: 710a7e40dc

Change-Id: I4959ae33844b003b6c37325c5b572239cf5da47f

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:18:17 +0000 (01:18 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0 am: 5a2e7e2e58
am: b2cdb4e2dd

Change-Id: I06acb1de8e89688e64b65f694cf29278a4cf7dde

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:17:18 +0000 (01:17 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours am: 5fce769ecf am: 642912652e am: a293067f0b
am: 3411150115

Change-Id: Ie622523996134026550caa6af4c5a858aeb04a60

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:10:00 +0000 (01:10 +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: badef8c88a

Change-Id: I4fe568d6b43e5a5c06aee6339f6fe4618865c2c6

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:02:56 +0000 (01:02 +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: c2a168d0ea

Change-Id: Ieb81e3872efd636a632ced390e41e2cd5156c81f

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:01:51 +0000 (01:01 +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: 4a11140df3

Change-Id: I5706916619ea4498a6a8b681e57b6a4ee1a0d10d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:57:22 +0000 (00:57 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:56:28 +0000 (00:56 +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: 758dede2d8

Change-Id: I8995e6ad4211353c28ac0d97e6908c343f1c8808

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:52:54 +0000 (00:52 +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: 8f53070436

Change-Id: I8d71d9d8eb575b1b5ed043605b2bf2dce5f939b7

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:51:22 +0000 (00:51 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846 am: 9f70b6d4c5 am: 1007b773b9 am: 8501b686f7
am: 5647953584

Change-Id: I9bb45562a4d0b30e2a173d3377101c42a7a58f8f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:47:40 +0000 (00:47 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6 am: 609145c315
am: 3985bf958e

Change-Id: Ib79d5010b4de507e66cb9a301c152d2f3c81d706

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:46:49 +0000 (00:46 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe am: e25ab62f5b
am: 9285808f9d

Change-Id: Ifde04e3733d5aa69968a21a1af7dbc4b0094797d