Neil Fuller
e13cd91161
Merge "Add tobiast@ to the OWNERS file" am: a931693721
am: 46e53e770c
...
am: bf673318f1
Change-Id: Ie65d0505a3f4bfb231657fa8503114969421a2ef
2019-07-02 16:26:40 -07:00
Neil Fuller
bf673318f1
Merge "Add tobiast@ to the OWNERS file" am: a931693721
...
am: 46e53e770c
Change-Id: I9229928c7e9895003869752df1602ed26b42b90e
2019-07-02 15:32:40 -07:00
Xin Li
c12cc62208
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 0a68e9bfe7
-s ours
...
am: 59b1a2f6bb
Change-Id: I4179542b8cf8fee2ee0002eabdcb47afdf51b054
2019-07-02 11:41:19 -07:00
Neil Fuller
46e53e770c
Merge "Add tobiast@ to the OWNERS file"
...
am: a931693721
Change-Id: Id52f2dcd3755f4fbbd6f6918e993063aebc582ac
2019-07-02 10:13:36 -07:00
Xin Li
59b1a2f6bb
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
am: 0a68e9bfe7
-s ours
am skip reason: subject contains skip directive
Change-Id: I075c4d89765d09a570e0150e486e85dc78772afc
2019-07-02 10:04:54 -07:00
Neil Fuller
a931693721
Merge "Add tobiast@ to the OWNERS file"
2019-07-02 14:27:55 +00:00
Neil Fuller
ca6542843c
Add tobiast@ to the OWNERS file
...
Add tobiast@ to the OWNERS file as libcore TL.
Remove pszczepaniak@ as he hasn't been on libcore
for a while.
Test: None
Change-Id: I714d3448ed60006cb58a0f49e95b7b834a6aac36
2019-07-02 10:55:50 +01:00
android-build-team Robot
64b912c151
Snap for 5702458 from 26a2694bd3
to qt-release
...
Change-Id: Ifeae76d0bea60dca5dcfb29ff8358e2ca04511f0
2019-07-02 04:30:03 +00:00
android-build-team Robot
897b61ddd2
Snap for 5702333 from da20a84f9b
to qt-c2f2-release
...
Change-Id: Ifeaa487b4fb1efde5ad764eec2417f5a286555e7
2019-07-02 03:11:21 +00:00
TreeHugger Robot
0cfcec2031
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
2019-07-02 00:17:22 +00:00
Bill Yi
7ed2100d0e
[automerger skipped] Import translations. DO NOT MERGE
...
am: da20a84f9b
-s ours
am skip reason: subject contains skip directive
Change-Id: Ieb2e642a9e61989a62c6c00574d132220b5ecfc6
2019-07-01 16:21:34 -07:00
Bill Yi
8d7e46515b
[automerger skipped] Import translations. DO NOT MERGE
...
am: da20a84f9b
-s ours
am skip reason: subject contains skip directive
Change-Id: Id4b0bbaac5733f8ed1f9eb99acdb67efcb4ff624
2019-07-01 16:21:33 -07:00
Bill Yi
a8d8d638af
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I90c0ada933cdd3d4b2431efdfe8290d3479aeac7
2019-07-01 14:22:44 -07:00
Xin Li
0a68e9bfe7
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
Bug: 134405016
Change-Id: I298dd1232c7e304b5d2cd9fda59006d08026698a
2019-07-01 21:00:04 +00:00
Bill Yi
da20a84f9b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6ab947284694fa3922d185f58f57c5acfd83b2ee
2019-07-01 12:27:35 -07:00
Robert Snoeberger
26688e912f
Merge "Remove "clocks" from string" into qt-r1-dev
...
am: a4a25871d4
Change-Id: I1236d44d730c5c24569002c4aab4c600b653706e
2019-07-01 10:36:26 -07:00
Robert Snoeberger
a350189b88
Merge "Remove "clocks" from string" into qt-r1-dev
...
am: a4a25871d4
Change-Id: I8181952741bdb57785a48485cb09072fb38484f2
2019-07-01 10:34:22 -07:00
Robert Snoeberger
a4a25871d4
Merge "Remove "clocks" from string" into qt-r1-dev
2019-07-01 17:19:27 +00:00
Robert Snoeberger
0e65d651d1
Remove "clocks" from string
...
Fixes: 136193731
Bug: 136090066
Test: manual
Change-Id: I63751bb31016754930a4773d791f118103026ada
2019-07-01 17:12:16 +00:00
Amin Shaikh
13ac03cc8d
Merge "Update ic_sync_problem to GM2." into qt-r1-dev
...
am: 0217400ea5
Change-Id: Id0dde389a42cf51d3bbabcd5476058f0acff44ad
2019-07-01 05:09:31 -07:00
Amin Shaikh
fea6983c2b
Merge "Update ic_sync_problem to GM2." into qt-r1-dev
...
am: 0217400ea5
Change-Id: I5c9d11a15eb86f60d91ebd3110ccc33fdefdf981
2019-07-01 05:08:46 -07:00
TreeHugger Robot
0217400ea5
Merge "Update ic_sync_problem to GM2." into qt-r1-dev
2019-07-01 11:52:33 +00:00
Bill Yi
1b807c64c4
[automerger skipped] Import translations. DO NOT MERGE am: 26a2694bd3
-s ours
...
am: ae58e057d7
-s ours
am skip reason: subject contains skip directive
Change-Id: Ieed2fbbaf549747d717c21c09758d2d72a641591
2019-07-01 03:00:39 -07:00
Bill Yi
ebe3b061ee
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 512b97f994
-s ours
am skip reason: subject contains skip directive
Change-Id: Iba6a4ef13d883f417bf6d88ead82a9b5b40a97f2
2019-07-01 02:59:21 -07:00
Bill Yi
9eff336d66
[automerger skipped] Import translations. DO NOT MERGE am: 26a2694bd3
-s ours
...
am: ae58e057d7
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibf26ca776141d30988f7ac69f14b7023d946d7fc
2019-07-01 02:58:55 -07:00
Bill Yi
a02965899f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 512b97f994
-s ours
am skip reason: subject contains skip directive
Change-Id: I2b9b5e64590a28f14e95fbca98b54806b10e1f62
2019-07-01 02:58:21 -07:00
Bill Yi
def50c6ed1
[automerger skipped] Import translations. DO NOT MERGE am: 26a2694bd3
-s ours
...
am: d1bdb4f72d
-s ours
am skip reason: subject contains skip directive
Change-Id: Ieb16394e9bfe0e0b80eb0a4b66085fe2ffe0f4e2
2019-07-01 02:58:20 -07:00
Bill Yi
ae58e057d7
[automerger skipped] Import translations. DO NOT MERGE
...
am: 26a2694bd3
-s ours
am skip reason: subject contains skip directive
Change-Id: I2c38c37556229f6ce9ac6acbbd5367bd239ff1ff
2019-07-01 02:45:08 -07:00
Bill Yi
d1bdb4f72d
[automerger skipped] Import translations. DO NOT MERGE
...
am: 26a2694bd3
-s ours
am skip reason: subject contains skip directive
Change-Id: I4c83a096d556894ace12a767de72ba62f6f3f587
2019-07-01 02:42:17 -07:00
TreeHugger Robot
eabf014bb3
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
2019-07-01 09:35:06 +00:00
TreeHugger Robot
512b97f994
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-01 09:35:04 +00:00
Pasty Chang
f458782f7e
Merge "Fix status bar color of a11y doesn't apply stencil" into qt-r1-dev
...
am: 2ba113898a
Change-Id: I599cabc0ec4f5d5661f74682e6fb6d73a21af71d
2019-06-30 18:57:28 -07:00
Pasty Chang
f76b39eb3c
Merge "Fix status bar color of a11y doesn't apply stencil" into qt-r1-dev
...
am: 2ba113898a
Change-Id: I247d6d369c41afb1e6fc5d14749877a2f2d8d2a1
2019-06-30 18:57:28 -07:00
Pasty Chang
2ba113898a
Merge "Fix status bar color of a11y doesn't apply stencil" into qt-r1-dev
2019-07-01 01:20:54 +00:00
Bill Yi
042c1d5eb7
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6d165ca5174555cba705f59a270f935cd6d52a6c
2019-06-30 16:21:10 -07:00
Bill Yi
9690c70312
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If33daab9a7d9e2c88b602147d66da40968412de6
2019-06-30 15:39:46 -07:00
Bill Yi
26a2694bd3
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I047beafb83c4c8df261fb5ac7c49dd81cb4470e0
2019-06-30 14:58:27 -07:00
android-build-team Robot
a0f532daff
Snap for 5698755 from 9cd8167bff
to qt-c2f2-release
...
Change-Id: I3c93ba7bed86abd2a0d5e0740af4a30d42f56770
2019-06-29 23:12:30 +00:00
android-build-team Robot
0ab6fbdb8f
Snap for 5698743 from 72aded338a
to qt-release
...
Change-Id: I7b33e1bba4dcfcd626adbc27eb40d4fc95e3af6b
2019-06-29 23:05:08 +00:00
tmfang
ef24931fd8
Merge "Add summary for white balance feature" into qt-r1-dev
...
am: 9cd8167bff
Change-Id: Ifbaf043712bc0bb46d1ce8e8338e6da34ddf06cb
2019-06-29 04:41:31 -07:00
tmfang
ac2bad7203
Merge "Add summary for white balance feature" into qt-r1-dev
...
am: 9cd8167bff
Change-Id: Id3d86efde3f1335f1f978f0f4d1339e7cd1461ab
2019-06-29 04:41:29 -07:00
TreeHugger Robot
9cd8167bff
Merge "Add summary for white balance feature" into qt-r1-dev
2019-06-29 10:57:45 +00:00
Andrew Sapperstein
bd5934623e
Merge "Add UI for mainline modules licenses." into qt-dev am: 72aded338a
...
am: 647f685063
Change-Id: I68de93372d8350b3538bcdf86ee811ce846d9a3a
2019-06-28 14:55:07 -07:00
Yanting Yang
925f5929de
Fix RTL issue of Deferred Setup card
...
am: f6972b29b1
Change-Id: Idf00d35429f6fed5250fdf6b8a4de962638ad976
2019-06-28 14:54:39 -07:00
Winson Chung
0839b6fdc7
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev am: 9591c3f963
...
am: 8d08713c96
Change-Id: I6561e5313a24b076e947f2ed875097883684f001
2019-06-28 14:54:28 -07:00
Evan Severson
e7f084deb2
Merge "Remove Permissions Hub. DO NOT MERGE" into qt-r1-dev
...
am: f461d8dc52
Change-Id: Id8374e6c7f1a3b7bce7e04d01ae1d0e8e61e6c1d
2019-06-28 14:54:07 -07:00
Joel Galenson
9aa82c09fe
Remove Permissions Hub. DO NOT MERGE
...
am: 69d9899868
Change-Id: I672b8c4f4184a0a2b96a0a7320103ef1754ff54e
2019-06-28 14:54:06 -07:00
Amin Shaikh
3e484def2f
Update Settings overlayed icons.
...
am: c477507f4e
Change-Id: Ia3ac06b30d829a14891c0811a89869640ccd225c
2019-06-28 14:53:48 -07:00
Kevin Chyn
95634cace1
Send userId together with enroll / setFeature / getFeature method update
...
Test: Enroll E2E
Bug: 136264301
Change-Id: Ie3f98ab80c831083d750d9459ed7a189df25dd66
2019-06-28 13:42:20 -07:00
Amin Shaikh
84c3f60ef5
Update ic_sync_problem to GM2.
...
- Use tint instead of custom fillColor to be consistent with overlays.
- Standardize on using @android:color/white as fill color
- Update list of overlayed icons.
Bug: 131346125
Test: make
Change-Id: I4bc88e5842ba2f149356929a77b81459ce5042c5
2019-06-28 16:35:24 -04:00