Bill Yi
|
e079b45c81
|
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 -s ours am: ccf6996623 -s ours" into oc-mr1-dev-plus-aosp
am: 47099cf173 -s ours
Change-Id: I70e2aea1799d8b38baa3a50818ac883b6bf37398
|
2017-07-22 16:47:52 +00:00 |
|
Bill Yi
|
a0a33d158c
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 -s ours am: 098c04e781 -s ours
am: eca137aa43 -s ours
Change-Id: Ice5b7d4cacd9b6179e1d60dc3a52a4e3798d0679
|
2017-07-22 16:47:28 +00:00 |
|
Android Build Merger (Role)
|
47099cf173
|
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 -s ours am: ccf6996623 -s ours" into oc-mr1-dev-plus-aosp
|
2017-07-22 16:38:48 +00:00 |
|
Bill Yi
|
eca137aa43
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 -s ours
am: 098c04e781 -s ours
Change-Id: Ie43f65cae3a7422bfbb0d95281e30489f1c36365
|
2017-07-22 16:38:29 +00:00 |
|
Bill Yi
|
4e3ff0501f
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 -s ours
am: ccf6996623 -s ours
Change-Id: I61ebe83e46f7dcaf8ffe3eddc817858c48695b38
|
2017-07-22 16:38:28 +00:00 |
|
Bill Yi
|
098c04e781
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 4d7111b0e9 -s ours
Change-Id: Ia23869b823b5f9f578eea955f037393960bb02e0
|
2017-07-22 16:32:30 +00:00 |
|
Bill Yi
|
ccf6996623
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 4d7111b0e9 -s ours
Change-Id: Ida2173d9ce4c4f4aa3efbb24fe0b68d9fa940a29
|
2017-07-22 16:32:30 +00:00 |
|
TreeHugger Robot
|
4d7111b0e9
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
|
2017-07-22 16:25:35 +00:00 |
|
TreeHugger Robot
|
06ce58b8d5
|
Merge "Import translations. DO NOT MERGE"
|
2017-07-22 16:13:53 +00:00 |
|
Bill Yi
|
555a55210a
|
Import translations. DO NOT MERGE
Change-Id: I0dbb4c3f5c88953469428df5ac70973d18e253ba
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
|
2017-07-22 03:57:25 -07:00 |
|
Bill Yi
|
5f049085b9
|
Import translations. DO NOT MERGE
Change-Id: I72ad5b5a671392c519f7a4ca5fce76404c2240b5
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
|
2017-07-22 03:36:18 -07:00 |
|
TreeHugger Robot
|
60bb1d39eb
|
Merge "Post preference update logic to main thread"
|
2017-07-22 02:23:48 +00:00 |
|
Andrew Sapperstein
|
4e5a6b988a
|
Merge "Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am: 59a66d9b77 am: ebd8308698" into oc-mr1-dev-plus-aosp
am: cdb44fee84
Change-Id: Ide1c6b5a25a0e9d891322097988e742afbab7d47
|
2017-07-22 00:44:28 +00:00 |
|
Fan Zhang
|
fe70452f51
|
Merge "Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce24 am: 3ecdee573b" into oc-mr1-dev-plus-aosp
am: b0431ad1ca
Change-Id: If8ce75c2b5afe786fd23ddcc66d21af188f20391
|
2017-07-22 00:44:07 +00:00 |
|
Lei Yu
|
f1286c1281
|
Merge "Merge "Make anomaly item refresh in battery" into oc-dr1-dev am: 0ec3e4e626 am: ab7a4db9df" into oc-mr1-dev-plus-aosp
am: 1ef1ea17b2
Change-Id: Icd3bdfcf117f4417bb3ef0cf631bace884231d38
|
2017-07-22 00:43:47 +00:00 |
|
Antony Sargent
|
46a4a76c90
|
Merge "Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am: a6ac4890ed am: 0531bd48e3" into oc-mr1-dev-plus-aosp
am: 465871284e
Change-Id: I45942af6b255c5d737058358493783eec48cf48e
|
2017-07-22 00:43:28 +00:00 |
|
Andrew Sapperstein
|
5a99deabf2
|
Merge "Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am: 59a66d9b77 am: 80a5336b25" into oc-mr1-dev-plus-aosp
am: 3c6df33d4b
Change-Id: I6768483e56d60effb2127720a39e36034716514d
|
2017-07-22 00:42:57 +00:00 |
|
Christine Franks
|
3c7c330038
|
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8 -s ours am: 18cd618368
am: e147a19773
Change-Id: I14470dfb8a49a412a7ec3b06136b2c4cb97d2345
|
2017-07-22 00:42:31 +00:00 |
|
Fan Zhang
|
8047d73aea
|
Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce24 am: ef0e290e65
am: 715f0956f4
Change-Id: I0fde0822693cffe0cf8f62296e8e14dde4fb84cf
|
2017-07-22 00:42:13 +00:00 |
|
Lei Yu
|
6b82b25e62
|
Merge "Make anomaly item refresh in battery" into oc-dr1-dev am: 0ec3e4e626 am: 454131cdb0
am: c857c195cf
Change-Id: I50a779fb43d72f15463d8eeced598922d22c37e3
|
2017-07-22 00:41:54 +00:00 |
|
Antony Sargent
|
99257e5d7f
|
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am: a6ac4890ed am: 62b7527da5
am: 75512a3215
Change-Id: I8d5d76660f90ae614eaa420d0072f2a6024a50d7
|
2017-07-22 00:41:38 +00:00 |
|
Christine Franks
|
4eeb7111c7
|
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8 am: c350386476 -s ours
am: c2bd97a5df
Change-Id: I0a3e1f1d9dcca852e1db83a92e2b5884dea02901
|
2017-07-22 00:41:22 +00:00 |
|
Android Build Merger (Role)
|
cdb44fee84
|
Merge "Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am: 59a66d9b77 am: ebd8308698" into oc-mr1-dev-plus-aosp
|
2017-07-22 00:38:00 +00:00 |
|
Andrew Sapperstein
|
012244e52d
|
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am: 59a66d9b77
am: ebd8308698
Change-Id: I5bcbe810c82c2a71a8cd8ff8f9ab5a6f4a6015e7
|
2017-07-22 00:37:40 +00:00 |
|
Android Build Merger (Role)
|
b0431ad1ca
|
Merge "Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce24 am: 3ecdee573b" into oc-mr1-dev-plus-aosp
|
2017-07-22 00:37:19 +00:00 |
|
Fan Zhang
|
fab6b8cd4d
|
Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce24
am: 3ecdee573b
Change-Id: Iceb537582606cca48f50de701232c8c868cc523c
|
2017-07-22 00:37:06 +00:00 |
|
Android Build Merger (Role)
|
1ef1ea17b2
|
Merge "Merge "Make anomaly item refresh in battery" into oc-dr1-dev am: 0ec3e4e626 am: ab7a4db9df" into oc-mr1-dev-plus-aosp
|
2017-07-22 00:37:00 +00:00 |
|
Lei Yu
|
5711e05a93
|
Merge "Make anomaly item refresh in battery" into oc-dr1-dev am: 0ec3e4e626
am: ab7a4db9df
Change-Id: Ic8abdff3468d1670533fe7bc99915fe3132c44ee
|
2017-07-22 00:36:48 +00:00 |
|
Android Build Merger (Role)
|
465871284e
|
Merge "Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am: a6ac4890ed am: 0531bd48e3" into oc-mr1-dev-plus-aosp
|
2017-07-22 00:36:43 +00:00 |
|
Antony Sargent
|
6055b14919
|
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am: a6ac4890ed
am: 0531bd48e3
Change-Id: I0c7931f70db596cce9ddeb91d2bbdc3fc2a99aeb
|
2017-07-22 00:36:30 +00:00 |
|
Android Build Merger (Role)
|
3c6df33d4b
|
Merge "Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am: 59a66d9b77 am: 80a5336b25" into oc-mr1-dev-plus-aosp
|
2017-07-22 00:36:29 +00:00 |
|
Christine Franks
|
e147a19773
|
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8 -s ours
am: 18cd618368
Change-Id: Ia4986adc50cca19ca72e2e036cd7bef78006bbaf
|
2017-07-22 00:36:07 +00:00 |
|
Andrew Sapperstein
|
ca87892984
|
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am: 59a66d9b77
am: 80a5336b25
Change-Id: Ib32bcfa22706abf89633b86333498f77328daebb
|
2017-07-22 00:36:03 +00:00 |
|
Andrew Sapperstein
|
ebd8308698
|
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
am: 59a66d9b77
Change-Id: I2b279d3a1562e693caeaf64f2f91ab629b4e294f
|
2017-07-22 00:33:13 +00:00 |
|
Fan Zhang
|
715f0956f4
|
Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce24
am: ef0e290e65
Change-Id: I77ca5052477a9e1efee01c7022378164096669b8
|
2017-07-22 00:32:48 +00:00 |
|
Fan Zhang
|
3ecdee573b
|
Merge "Tweak bluetooth name preference" into oc-dr1-dev
am: 03c595ce24
Change-Id: I1d2f8d65fb7ba48bac656222c4501306103b385c
|
2017-07-22 00:32:42 +00:00 |
|
Andrew Sapperstein
|
80a5336b25
|
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
am: 59a66d9b77
Change-Id: I7513463a50ddef4f49d8d7ab06ed8fd9e19d3a52
|
2017-07-22 00:32:32 +00:00 |
|
Christine Franks
|
61082f5d58
|
Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev am: fd8b8eb0b1
am: 8061500847
Change-Id: I76248c968334e04f9b878f184f60596cf5750a68
|
2017-07-22 00:32:30 +00:00 |
|
Lei Yu
|
c857c195cf
|
Merge "Make anomaly item refresh in battery" into oc-dr1-dev am: 0ec3e4e626
am: 454131cdb0
Change-Id: I3feacbe94bca351809341e60464a6834e6980a12
|
2017-07-22 00:32:27 +00:00 |
|
Lei Yu
|
ab7a4db9df
|
Merge "Make anomaly item refresh in battery" into oc-dr1-dev
am: 0ec3e4e626
Change-Id: Ie3e4b7ead145b22c44383443229043722b9e86d9
|
2017-07-22 00:32:21 +00:00 |
|
Antony Sargent
|
75512a3215
|
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am: a6ac4890ed
am: 62b7527da5
Change-Id: Ibfe8afab3bf662c2855a28c27d636da17444eb79
|
2017-07-22 00:32:07 +00:00 |
|
Antony Sargent
|
0531bd48e3
|
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
am: a6ac4890ed
Change-Id: Ib4cbffa94b0372419f60f16972836df27ad1fecf
|
2017-07-22 00:32:00 +00:00 |
|
Christine Franks
|
c2bd97a5df
|
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8
am: c350386476 -s ours
Change-Id: I6371e6575ba1b60dfe1c715c46e17be4f6340d98
|
2017-07-22 00:31:48 +00:00 |
|
Christine Franks
|
18cd618368
|
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
am: cb9a7075f8 -s ours
Change-Id: Id75c03768308873b6b2666eaae6d1c86f23d1663
|
2017-07-22 00:31:39 +00:00 |
|
TreeHugger Robot
|
59a66d9b77
|
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
|
2017-07-22 00:28:31 +00:00 |
|
Christine Franks
|
8061500847
|
Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev
am: fd8b8eb0b1
Change-Id: I2f22b732d4268af4ce2fd537746287bda8091e70
|
2017-07-22 00:11:01 +00:00 |
|
Fan Zhang
|
d6e51123a4
|
Post preference update logic to main thread
Change-Id: Ic1e1f64446a9aec9da7dce3fd23ae4ba17b25b28
Fix: 36131513
Test: robotests in the same topic
|
2017-07-21 17:04:42 -07:00 |
|
Christine Franks
|
fd8b8eb0b1
|
Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev
|
2017-07-21 23:59:23 +00:00 |
|
TreeHugger Robot
|
a17567bd4b
|
Merge "Layout tweak for app action buttons"
|
2017-07-21 23:49:37 +00:00 |
|
Bill Yi
|
dfd2f1ff4b
|
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: f364c30330 -s ours
am: 1c6e27b4d5 -s ours
Change-Id: Ic27d3670df76b1543e128c7f3eefd9f606b7ae56
|
2017-07-21 22:22:55 +00:00 |
|