Fan Zhang
cbc4218b9b
Format data usage and data limit consistently.
...
The usage formatter's format flag is change to match data limt flag.
Change-Id: I37d3c8c7bc67a918c793f4799e060010d269834d
Fixes: 63581756
Test: robotests
2017-10-11 15:01:10 -07: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
2017-10-11 22:00:24 +00:00
Jeff Sharkey
03988b58b3
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
...
am: 1c91c0c801
2017-10-11 21:55:34 +00:00
Beverly
ad898e6928
Replaced dnd priority setting page w/ behavior.
...
Bug: 63077372
Test: manual, make -j20 RunSettingsRoboTests
Change-Id: I79fd431da0cbed1407f0dab38e64f0bdb3ff3feb
2017-10-11 17:55:00 -04:00
Jeff Sharkey
c08aea6e80
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours am: b410435a21 am: de7c312543 am: c1574a1ef8
...
am: c2198532bf
2017-10-11 21:54:43 +00:00
Jeff Sharkey
0a121334b2
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df am: f4e2e26064 am: 8bdd94e292
...
am: f70906f2da
2017-10-11 21:53:47 +00:00
Fan Zhang
091ebcc923
Merge "Move SettingsRobolectricTestRunner to testutils." am: 16db22a9c8 -s ours am: e39bcb6bf5 -s ours am: eef095d0ee -s ours
...
am: 78896c40ac
2017-10-11 21:52:47 +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
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
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
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
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
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
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
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
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
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
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
2017-10-11 21:31:35 +00:00
TreeHugger Robot
3f4a7922f4
Merge "Import translations. DO NOT MERGE"
2017-10-11 21:31:08 +00:00
Jeff Sharkey
82d1d2d9a4
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa -s ours am: 70387afef9 am: 9173362f4e am: cf1c0b1f58
...
am: 9c5abedc54
2017-10-11 21:28:47 +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
2017-10-11 21:28:38 +00:00
Jeff Sharkey
cc2cb70249
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa -s ours am: 70387afef9 am: 9173362f4e am: 0b34b23f8b
...
am: 50af9f6724
2017-10-11 21:28:09 +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
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
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
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
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
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
2017-10-11 21:12:41 +00:00
Fan Zhang
eef095d0ee
Merge "Move SettingsRobolectricTestRunner to testutils." am: 16db22a9c8 -s ours
...
am: e39bcb6bf5
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
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
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
2017-10-11 21:01:29 +00:00
Fan Zhang
e39bcb6bf5
Merge "Move SettingsRobolectricTestRunner to testutils."
...
am: 16db22a9c8
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
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
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
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
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
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
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
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
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
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
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
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
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
2017-10-11 20:32:38 +00:00
Jeff Sharkey
45926efd0f
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499
...
am: 556688abdb
2017-10-11 20:31:41 +00:00
Jeff Sharkey
979efb53d0
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d
...
am: 7c41707eaf
2017-10-11 20:29:25 +00:00
