Fan Zhang
c85c84f12b
Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev am: e28599049e
...
am: 88ce094235
2017-06-23 17:47:36 +00:00
Fan Zhang
88ce094235
Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev
...
am: e28599049e
2017-06-23 17:34:00 +00:00
TreeHugger Robot
e28599049e
Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev
2017-06-23 17:27:59 +00:00
Bill Yi
49b5de942e
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours am: bbeaae705d -s ours
...
am: a043cf04df
2017-06-23 13:31:23 +00:00
Bill Yi
c8c242379a
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 6300674d27 -s ours
...
am: 995b3898c4
2017-06-23 13:30:51 +00:00
Bill Yi
a90c3c8948
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours am: 5386943cf2 -s ours
...
am: 16ec3c30e5
2017-06-23 13:30:03 +00:00
Bill Yi
a043cf04df
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours
...
am: bbeaae705d
2017-06-23 13:00:52 +00:00
Bill Yi
995b3898c4
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 6300674d27
2017-06-23 13:00:07 +00:00
Bill Yi
16ec3c30e5
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours
...
am: 5386943cf2
2017-06-23 12:48:51 +00:00
Bill Yi
bbeaae705d
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 6b1ff7073a
2017-06-23 12:39:42 +00:00
TreeHugger Robot
6300674d27
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-06-23 12:32:32 +00:00
Bill Yi
5386943cf2
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 6b1ff7073a
2017-06-23 12:29:05 +00:00
TreeHugger Robot
6b1ff7073a
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-06-23 12:23:16 +00:00
Bill Yi
8ec66e1f56
Import translations. DO NOT MERGE
...
Change-Id: I86e7dbea32adfb191ec6bb40cb2a4714bd583c24
Auto-generated-cl: translation import
2017-06-23 01:39:20 -07:00
Bill Yi
0695fc5d2b
Import translations. DO NOT MERGE
...
Change-Id: I277e41f97963c4f676aef802c9f0ce2c47838515
Auto-generated-cl: translation import
2017-06-23 01:33:27 -07:00
Daniel Nishi
f9b3997a71
Merge "Count cache in storage categories. am: b22b85b593 am: b57a71fe08" into oc-dr1-dev-plus-aosp
...
am: d570ab1595
2017-06-23 04:44:59 +00:00
Daniel Nishi
c758c52ab0
Count cache in storage categories. am: b22b85b593 am: 5837a9b98b
...
am: 41400d022c
2017-06-23 04:37:22 +00:00
Android Build Merger (Role)
d570ab1595
Merge "Count cache in storage categories. am: b22b85b593 am: b57a71fe08" into oc-dr1-dev-plus-aosp
2017-06-23 04:30:21 +00:00
Daniel Nishi
41400d022c
Count cache in storage categories. am: b22b85b593
...
am: 5837a9b98b
2017-06-23 04:28:49 +00:00
Daniel Nishi
1b1d779ed4
Count cache in storage categories. am: b22b85b593
...
am: b57a71fe08
2017-06-23 04:28:43 +00:00
Daniel Nishi
5837a9b98b
Count cache in storage categories.
...
am: b22b85b593
2017-06-23 04:19:19 +00:00
Daniel Nishi
b57a71fe08
Count cache in storage categories.
...
am: b22b85b593
2017-06-23 04:19:16 +00:00
Daniel Nishi
b22b85b593
Count cache in storage categories.
...
This makes the System size more consistent because cache is not
attributed to the system (when the cache is under quota).
Change-Id: I680e70daf5e98b9a205023a218dfd1dcc8ee8334
Fixes: 62623731
Test: Settings Unit Test
2017-06-22 19:08:48 -07:00
Fan Zhang
9ef5f21b8a
Merge "Load regulatory info from /data/misc" into oc-dr1-dev am: f964e8c3b2
...
am: 9f7227eb59
2017-06-23 01:47:45 +00:00
Fan Zhang
9f7227eb59
Merge "Load regulatory info from /data/misc" into oc-dr1-dev
...
am: f964e8c3b2
2017-06-23 01:43:15 +00:00
TreeHugger Robot
f964e8c3b2
Merge "Load regulatory info from /data/misc" into oc-dr1-dev
2017-06-23 01:37:47 +00:00
Marie Janssen
c65f852b3e
Merge "Bluetooth: Make notifications local-only am: 1138397336 am: 493a76e087" into oc-dr1-dev-plus-aosp
...
am: 297ab4cbf7
2017-06-23 00:32:29 +00:00
Marie Janssen
0088711037
Bluetooth: Make notifications local-only am: 1138397336 am: 0efa2b3427
...
am: 56adef485a
2017-06-23 00:31:52 +00:00
Android Build Merger (Role)
297ab4cbf7
Merge "Bluetooth: Make notifications local-only am: 1138397336 am: 493a76e087" into oc-dr1-dev-plus-aosp
2017-06-23 00:27:29 +00:00
Marie Janssen
c514cd9483
Bluetooth: Make notifications local-only am: 1138397336
...
am: 493a76e087
2017-06-23 00:26:59 +00:00
Marie Janssen
56adef485a
Bluetooth: Make notifications local-only am: 1138397336
...
am: 0efa2b3427
2017-06-23 00:26:53 +00:00
Marie Janssen
493a76e087
Bluetooth: Make notifications local-only
...
am: 1138397336
2017-06-23 00:22:24 +00:00
Marie Janssen
0efa2b3427
Bluetooth: Make notifications local-only
...
am: 1138397336
2017-06-23 00:22:23 +00:00
Fan Zhang
aedcd8b519
Fix presubmit test
...
Change-Id: I8c1f35fc76ed153080655242943fdfa9c29cf5bb
Fix: 62913954
Test: robotests
2017-06-22 15:51:54 -07:00
Maurice Lam
9534677b9e
Merge "Tint suggestion icons" into oc-dr1-dev am: c1ab582fae
...
am: a1130d5d12
2017-06-22 21:58:54 +00:00
Maurice Lam
a1130d5d12
Merge "Tint suggestion icons" into oc-dr1-dev
...
am: c1ab582fae
2017-06-22 21:44:22 +00:00
Maurice Lam
554c95fbb1
Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev am: cf3130338c
...
am: 15bcab49f7
2017-06-22 21:36:47 +00:00
Maurice Lam
71dfd08b97
Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev am: e1eae4f05f
...
am: 6d33cabb0f
2017-06-22 21:35:36 +00:00
Doris Ling
296bdda5df
Merge "Update summary for Recent Apps." into oc-dr1-dev am: d7fc071f48
...
am: dc361053a0
2017-06-22 21:34:40 +00:00
TreeHugger Robot
c1ab582fae
Merge "Tint suggestion icons" into oc-dr1-dev
2017-06-22 21:33:42 +00:00
Fan Zhang
1bc7ac3bfa
Load regulatory info from /data/misc
...
Bug: 62837579
Test: settings test
Change-Id: I84ef037174a1839993d02e8cd46d159398be1ddc
2017-06-22 20:13:21 +00:00
Fan Zhang
86542ec1f6
Add a flag to enable/disable new device suggestion
...
Change-Id: Iebf982731a01b3d6c1d3ad60e9d1f858f4e9151e
Fix: 62907886
Test: make RunSettingsRoboTests
2017-06-22 20:03:09 +00:00
Maurice Lam
15bcab49f7
Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev
...
am: cf3130338c
2017-06-22 20:02:48 +00:00
TreeHugger Robot
cf3130338c
Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev
2017-06-22 19:58:51 +00:00
Maurice Lam
6d33cabb0f
Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev
...
am: e1eae4f05f
2017-06-22 19:58:02 +00:00
Doris Ling
dc361053a0
Merge "Update summary for Recent Apps." into oc-dr1-dev
...
am: d7fc071f48
2017-06-22 19:57:20 +00:00
TreeHugger Robot
03849d1484
Merge "Switch Utils.formatElapsedTime to use ICU's MeasureFormat"
2017-06-22 19:49:35 +00:00
Maurice Lam
e1eae4f05f
Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev
2017-06-22 19:48:12 +00:00
TreeHugger Robot
d7fc071f48
Merge "Update summary for Recent Apps." into oc-dr1-dev
2017-06-22 19:39:10 +00:00
TreeHugger Robot
176506e54c
Merge "Catch invalid extra when launching help trampoline."
2017-06-22 19:23:45 +00:00
