Commit Graph

39837 Commits

Author SHA1 Message Date
Jeff Sharkey
920ca35d48 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours am: 952ae3ec34 am: 8b399b3eb7
am: 1c4d686b0c

Change-Id: I2258de70628d91b3e3955391bc5ef999e2865c2d
2017-10-11 22:40:15 +00:00
Jeff Sharkey
5477a61da6 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours am: 0f53a56cbd am: 9138455b41
am: dcd1c0dde1

Change-Id: Ie97f00549bf2299165f5a32d72feae14fc92b796
2017-10-11 22:38:38 +00:00
Bill Yi
448638a650 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: c43238e7f4  -s ours

Change-Id: Idbf4df00a798f85d78e1953745659f09d4290c65
2017-10-11 22:37:09 +00:00
Jeff Sharkey
85a79da59e DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003 -s ours am: 47bc5fba05 am: 4d61a1bd15
am: 91719dc7bd

Change-Id: I364e8d1b5239ef75e73236192e48ae936677f6fb
2017-10-11 22:36:31 +00:00
Jeff Sharkey
cc83075f0e DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours am: b410435a21 am: de7c312543
am: fb1bd3b2c6

Change-Id: I395dc28cb99328191e93c2096bfdcb7889e82082
2017-10-11 22:35:01 +00:00
Jeff Sharkey
a9e21a2864 Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df am: f4e2e26064
am: d563d23d26

Change-Id: Id82fbbac6455d22623355e0f4c5e24733bd5d6e3
2017-10-11 22:33:45 +00:00
Jeff Sharkey
1c4d686b0c DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours am: 952ae3ec34
am: 8b399b3eb7

Change-Id: I42b7d928abb3e1ae71f6e23ddceba969a821f639
2017-10-11 22:19:18 +00:00
Jeff Sharkey
dcd1c0dde1 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours am: 0f53a56cbd
am: 9138455b41

Change-Id: Iaad4be44e1410eac3b0b63d33953bf643d2b3503
2017-10-11 22:17:49 +00:00
TreeHugger Robot
c43238e7f4 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-10-11 22:16:37 +00:00
Jeff Sharkey
8b399b3eb7 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours
am: 952ae3ec34

Change-Id: I40c3ad091c63617baf047a6ce98ad5129d04e7dc
2017-10-11 22:02:29 +00:00
Jeff Sharkey
9138455b41 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours
am: 0f53a56cbd

Change-Id: I8ee12f143c82b42ca3d06537e1d576577c22c883
2017-10-11 22:00:24 +00:00
Jeff Sharkey
91719dc7bd DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003 -s ours am: 47bc5fba05
am: 4d61a1bd15

Change-Id: I7f3fc44f882eed0a435e75cec95c7a03219cc67a
2017-10-11 21:47:52 +00:00
Jeff Sharkey
fb1bd3b2c6 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours am: b410435a21
am: de7c312543

Change-Id: If4193b75eaccdc612b94af027a8ce6548e613aad
2017-10-11 21:46:44 +00:00
Jeff Sharkey
d563d23d26 Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df
am: f4e2e26064

Change-Id: I7a621bcf8afdc1a3cb80e7e57d25adf5f96a17f0
2017-10-11 21:45:11 +00:00
Jeff Sharkey
952ae3ec34 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44
am: e803004863  -s ours

Change-Id: If486735b63d2f652bd8d99a01a18f4d5fd8a88bc
2017-10-11 21:42:57 +00:00
Jeff Sharkey
0f53a56cbd DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb
am: 250d5e60b0  -s ours

Change-Id: I03181b1d378a0f299871cb34551b83aa0fe16dd6
2017-10-11 21:42:14 +00:00
Jeff Sharkey
1c91c0c801 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003 -s ours am: 47bc5fba05 am: 4d61a1bd15
am: 09112f231c

Change-Id: I816186e9a1e6719c88b7121a65071b8dc29981b2
2017-10-11 21:35:26 +00:00
Jeff Sharkey
e803004863 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79
am: 2433b6dc44

Change-Id: I3e2938793111b4b547d4a70ebbf57b8e8f57fd37
2017-10-11 21:34:11 +00:00
Jeff Sharkey
c2198532bf DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours am: b410435a21 am: de7c312543
am: c1574a1ef8

Change-Id: I2eb18e0ad264898662f921ba3cf582a2875bdad4
2017-10-11 21:33:51 +00:00
Jeff Sharkey
250d5e60b0 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3
am: 3aa36a6afb

Change-Id: I8f5d74a40d179512466a3d2e77416b5222da01e7
2017-10-11 21:33:01 +00:00
Jeff Sharkey
f70906f2da Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df am: f4e2e26064
am: 8bdd94e292

Change-Id: I12e601375713fd8491007e93ae5133e3bbfd0b6c
2017-10-11 21:32:33 +00:00
Fan Zhang
78896c40ac Merge "Move SettingsRobolectricTestRunner to testutils." am: 16db22a9c8 -s ours am: e39bcb6bf5 -s ours
am: eef095d0ee  -s ours

Change-Id: I14bd887cac26c0b3ced671d971f4d059a061088d
2017-10-11 21:31:35 +00:00
Jeff Sharkey
09112f231c DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003 -s ours am: 47bc5fba05
am: 4d61a1bd15

Change-Id: Icc827672d37662817ccf7e0e2be21c685f96bc79
2017-10-11 21:28:38 +00:00
Jeff Sharkey
c1574a1ef8 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours am: b410435a21
am: de7c312543

Change-Id: I46cb89e7594fae1988f5ea08416549019452332e
2017-10-11 21:27:27 +00:00
Jeff Sharkey
8bdd94e292 Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df
am: f4e2e26064

Change-Id: I21d3d925c533b9bbcb8bef5807662a1ad6186394
2017-10-11 21:26:28 +00:00
Jeff Sharkey
4d61a1bd15 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003 -s ours
am: 47bc5fba05

Change-Id: Icf6b9c17a843608befc1250a9fdcf8a10dfa8848
2017-10-11 21:24:25 +00:00
Jeff Sharkey
2433b6dc44 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d
am: d721694b79

Change-Id: Ie3b5bc22af9ddbf47c6236d40a21d8bc051599be
2017-10-11 21:21:40 +00:00
Jeff Sharkey
3aa36a6afb DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239
am: 53a69985b3

Change-Id: Icadeebe688c38f4e4d0b190ed07acd7d5396aef3
2017-10-11 21:20:09 +00:00
Jeff Sharkey
47bc5fba05 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda
am: efe9e7e003  -s ours

Change-Id: If71fe96139c86fce8be3d1866342a050df3c9f6f
2017-10-11 21:12:41 +00:00
Fan Zhang
eef095d0ee Merge "Move SettingsRobolectricTestRunner to testutils." am: 16db22a9c8 -s ours
am: e39bcb6bf5  -s ours

Change-Id: I0e2e798dee860a0d708fec3313b3b4c7f2ab3f79
2017-10-11 21:11:25 +00:00
Jeff Sharkey
de7c312543 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours
am: b410435a21

Change-Id: I91421c6629af2131e7aaeadac048c92da9653212
2017-10-11 21:10:10 +00:00
Jeff Sharkey
f4e2e26064 Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
am: 9c39da39df

Change-Id: Ic7566b0972c30c9e7b5a183888238eca44709d47
2017-10-11 21:09:20 +00:00
Jeff Sharkey
d721694b79 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e
am: 86cc9a681d

Change-Id: I30d07aff1d361734e7a962dd89d1935137ed64dd
2017-10-11 21:01:29 +00:00
Fan Zhang
e39bcb6bf5 Merge "Move SettingsRobolectricTestRunner to testutils."
am: 16db22a9c8  -s ours

Change-Id: I7a4a2d5326b1e617beab32a4be4bfe5b7de7409a
2017-10-11 21:01:23 +00:00
Jeff Sharkey
53a69985b3 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3
am: b3d4bc8239

Change-Id: I02141baa2a53d2982856052a923be6ddd076c55f
2017-10-11 21:00:27 +00:00
Jeff Sharkey
efe9e7e003 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0
am: fe1daa6eda

Change-Id: I943b70a1dfc085ff0a4e4e46afb29aec1aa6c965
2017-10-11 20:57:51 +00:00
Jeff Sharkey
9c5abedc54 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa -s ours am: 70387afef9 am: 9173362f4e
am: cf1c0b1f58

Change-Id: I502a85737c41f79068e2a2d7417cce8e52957794
2017-10-11 20:49:46 +00:00
Jeff Sharkey
50af9f6724 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa -s ours am: 70387afef9 am: 9173362f4e
am: 0b34b23f8b

Change-Id: I8c323e0cde1c1bf060c6214b7f0a81441a5e7e5b
2017-10-11 20:47:27 +00:00
Jeff Sharkey
86cc9a681d DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours
am: 004f90f35e

Change-Id: I2665557fb25ced0978a90fed4edff989011e01ed
2017-10-11 20:46:28 +00:00
Treehugger Robot
16db22a9c8 Merge "Move SettingsRobolectricTestRunner to testutils." 2017-10-11 20:45:19 +00:00
Jeff Sharkey
b3d4bc8239 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours
am: 89791cb5c3

Change-Id: Ie179a077b08e79040603c467e0a912731636e2f2
2017-10-11 20:45:04 +00:00
Jeff Sharkey
fe1daa6eda DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf
am: 979efb53d0

Change-Id: Iad023fb1a0ff8fded7963b5e7087457803fe213c
2017-10-11 20:44:53 +00:00
Jeff Sharkey
b410435a21 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346
am: 46bc2bd7bd  -s ours

Change-Id: I55b5048ea4ecb689a7d483afeb174a153cc54fdc
2017-10-11 20:39:07 +00:00
Jeff Sharkey
cf1c0b1f58 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa -s ours am: 70387afef9
am: 9173362f4e

Change-Id: Ifeffebaae3402a18fc1eb4883f46f7827e2b23df
2017-10-11 20:36:04 +00:00
Jeff Sharkey
0b34b23f8b DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa -s ours am: 70387afef9
am: 9173362f4e

Change-Id: I8eb3e136b4edb5858a681fb69c0f90d216255e55
2017-10-11 20:35:37 +00:00
Jeff Sharkey
004f90f35e DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7
am: ba66bb8a43  -s ours

Change-Id: I3431178e94b81aa61b7f829217a40fdee4eac141
2017-10-11 20:35:23 +00:00
Jeff Sharkey
89791cb5c3 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb
am: 45926efd0f  -s ours

Change-Id: Ieeea7848f879564074e1fb32d4c5c834d21e63cc
2017-10-11 20:34:40 +00:00
TreeHugger Robot
9c39da39df Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev 2017-10-11 20:32:55 +00:00
Jeff Sharkey
ba66bb8a43 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab
am: 95bbef26d7

Change-Id: I32314303ab0926d93ae035166e323bcce847b7bd
2017-10-11 20:32:38 +00:00
Jeff Sharkey
45926efd0f DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499
am: 556688abdb

Change-Id: Ia7daf15c3d9fc81ae8fdef25f79cc13558639e98
2017-10-11 20:31:41 +00:00